mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-04 22:25:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

All String->set() now have charset argument

Browse source
This commit is contained in:
unknown 2002-10-30 16:19:43 +04:00
commit 85f35cbf57
13 changed files with 94 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

11
sql/item_timefunc.h
View file

@ -67,7 +67,11 @@ public:
Item_func_month(Item *a) :Item_func(a) {}
longlong val_int();
double val() { return (double) Item_func_month::val_int(); }
String *val_str(String *str) { str->set(val_int()); return null_value ? 0 : str;}
String *val_str(String *str)
{
str->set(val_int(), my_thd_charset);
return null_value ? 0 : str;
}
const char *func_name() const { return "month"; }
enum Item_result result_type () const { return INT_RESULT; }
void fix_length_and_dec() { decimals=0; max_length=2; maybe_null=1; }
@ -172,7 +176,10 @@ public:
:Item_func(a), odbc_type(type_arg) {}
longlong val_int();
double val() { return (double) val_int(); }
String *val_str(String *str) { str->set(val_int()); return null_value ? 0 : str;}
String *val_str(String *str) {
str->set(val_int(), my_thd_charset);
return null_value ? 0 : str;
}
const char *func_name() const { return "weekday"; }
enum Item_result result_type () const { return INT_RESULT; }
void fix_length_and_dec() { decimals=0; max_length=1; maybe_null=1; }