diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-03-04 09:03:07 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-03-04 09:03:07 +0100 |
| commit | 861ba6cce8d1496e85469d14e7412b588c5a3c72 (patch) | |
| tree | f39b89f218ff81ceb62349eb225a455d52c3ba78 /sql/item_timefunc.cc | |
| parent | f6278abfd7cf3735d58b0b4c3052b0f6a4f08c3b (diff) | |
| parent | 370fc6b144bb3d0765ba6941ab4945a2544701a5 (diff) | |
| download | mariadb-git-861ba6cce8d1496e85469d14e7412b588c5a3c72.tar.gz | |
Merge MySQL 5.1.44 into MariaDB.mariadb-merge-mysql-5.1.44
Diffstat (limited to 'sql/item_timefunc.cc')
| -rw-r--r-- | sql/item_timefunc.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/item_timefunc.cc b/sql/item_timefunc.cc index 964edba4988..a244a674bbf 100644 --- a/sql/item_timefunc.cc +++ b/sql/item_timefunc.cc @@ -2560,9 +2560,9 @@ void Item_char_typecast::fix_length_and_dec() from_cs != &my_charset_bin && cast_cs != &my_charset_bin); collation.set(cast_cs, DERIVATION_IMPLICIT); - char_length= (cast_length >= 0) ? - cast_length : - args[0]->max_length / args[0]->collation.collation->mbmaxlen; + char_length= (cast_length >= 0) ? cast_length : + args[0]->max_length / + (cast_cs == &my_charset_bin ? 1 : args[0]->collation.collation->mbmaxlen); max_length= char_length * cast_cs->mbmaxlen; } |