diff options
| author | bar@gw.udmsearch.izhnet.ru <> | 2002-05-17 16:29:52 +0500 |
|---|---|---|
| committer | bar@gw.udmsearch.izhnet.ru <> | 2002-05-17 16:29:52 +0500 |
| commit | 196aa19cf6624c17fb3c36c876e3e1a40f18ed23 (patch) | |
| tree | e4f1191a52998c24839a96bb95784af36d1f03d0 /sql/item_timefunc.cc | |
| parent | 7fce07d52d8411d5b97f9de12661c664b1c552b5 (diff) | |
| download | mariadb-git-196aa19cf6624c17fb3c36c876e3e1a40f18ed23.tar.gz | |
Now string values are created and filled with charset field
SELECT func(charset2) FROM t ORDER BY 1 works in correct charset
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 32 |
1 files changed, 26 insertions, 6 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 404d44d7122..9bbb9e4fe19 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -29,11 +29,31 @@ ** Todo: Move month and days to language files */ -static String month_names[] = { "January", "February", "March", "April", - "May", "June", "July", "August", - "September", "October", "November", "December" }; -static String day_names[] = { "Monday", "Tuesday", "Wednesday", - "Thursday", "Friday", "Saturday" ,"Sunday" }; +static String month_names[] = +{ + String("January", default_charset_info), + String("February", default_charset_info), + String("March", default_charset_info), + String("April", default_charset_info), + String("May", default_charset_info), + String("June", default_charset_info), + String("July", default_charset_info), + String("August", default_charset_info), + String("September", default_charset_info), + String("October", default_charset_info), + String("November", default_charset_info), + String("December", default_charset_info) +}; +static String day_names[] = +{ + String("Monday", default_charset_info), + String("Tuesday", default_charset_info), + String("Wednesday", default_charset_info), + String("Thursday", default_charset_info), + String("Friday", default_charset_info), + String("Saturday", default_charset_info), + String("Sunday", default_charset_info) +}; /* ** Get a array of positive numbers from a string object. @@ -376,7 +396,7 @@ String *Item_date::val_str(String *str) return (String*) 0; if (!value) // zero daynr { - str->copy("0000-00-00"); + str->copy("0000-00-00",10); return str; } if (str->alloc(11)) |