← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Brian Aker
  • Date: 2011-01-12 06:45:23 UTC
  • mto: (2073.1.4 catalogs)
  • mto: This revision was merged to the branch mainline in revision 2080.
  • Revision ID: brian@tangent.org-20110112064523-rqhptaqbph22qmj1
Remove custom error.

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
24
 
26
25
namespace drizzled
27
26
{
31
30
  assert(fixed == 1);
32
31
  uint32_t weekday=(uint) val_int();            // Always Item_func_daynr()
33
32
  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= getSession().variables.lc_time_names->day_names->type_names[weekday];
 
38
  day_name= session->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
}