diff options
| author | hf@deer.mysql.r18.ru <> | 2003-01-15 13:15:35 +0400 |
|---|---|---|
| committer | hf@deer.mysql.r18.ru <> | 2003-01-15 13:15:35 +0400 |
| commit | 96089e2b3a013c83e812672284bf10a34ba9d11c (patch) | |
| tree | 937beb6f27e5e7958081a4a5ba13ceb2f5251396 /sql/item_timefunc.cc | |
| parent | c59bff7c96bf90c9c4dafdb80684fb438bb43734 (diff) | |
| parent | 809af00b0672242cc1b0fee114a34f414ec9055a (diff) | |
| download | mariadb-git-96089e2b3a013c83e812672284bf10a34ba9d11c.tar.gz | |
resolving conflicts
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 796070acb8a..744c0c1fa49 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -529,7 +529,7 @@ void Item_func_now::fix_length_and_dec() { struct tm tm_tmp,*start; time_t query_start=current_thd->query_start(); - CHARSET_INFO *cs=thd_charset(); + CHARSET_INFO *cs=my_charset_bin; decimals=0; max_length=19*cs->mbmaxlen; |