← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/time/dayname.cc

  • Committer: Mark Atwood
  • Date: 2011-08-11 03:05:03 UTC
  • mfrom: (2385.1.12 refactor4)
  • Revision ID: me@mark.atwood.name-20110811030503-rp9xjihc5x3y0x4q
merge lp:~olafvdspek/drizzle/refactor4

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/time/dayname.cc
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include "config.h"
 
20
#include <config.h>
21
21
 
22
22
#include <drizzled/function/time/dayname.h>
23
23
#include <drizzled/session.h>
 
24
#include <drizzled/typelib.h>
 
25
#include <drizzled/system_variables.h>
24
26
 
25
 
namespace drizzled
26
 
{
 
27
namespace drizzled {
27
28
 
28
29
String* Item_func_dayname::val_str(String* str)
29
30
{
30
31
  assert(fixed == 1);
31
32
  uint32_t weekday=(uint) val_int();            // Always Item_func_daynr()
32
33
  const char *day_name;
33
 
  Session *session= current_session;
34
34
 
35
35
  if (null_value)
36
36
    return (String*) 0;
37
37
 
38
 
  day_name= session->variables.lc_time_names->day_names->type_names[weekday];
 
38
  day_name= getSession().variables.lc_time_names->day_names->type_names[weekday];
39
39
  str->set(day_name, strlen(day_name), system_charset_info);
40
40
  return str;
41
41
}