diff options
| author | Alexander Barkov <alexander.barkov@oracle.com> | 2011-03-03 18:46:30 +0300 |
|---|---|---|
| committer | Alexander Barkov <alexander.barkov@oracle.com> | 2011-03-03 18:46:30 +0300 |
| commit | 1a48afc1c64b165c1dc3b78480828367b7af4e69 (patch) | |
| tree | 830a69da7cf587333ba50749c844eb350647a74f /sql/item_strfunc.h | |
| parent | cb018d83d758537694fbf1597657266e8f9cd517 (diff) | |
| parent | a1e9be8e8b17e5f14be9edc558e69c4f68d01fab (diff) | |
| download | mariadb-git-1a48afc1c64b165c1dc3b78480828367b7af4e69.tar.gz | |
Merging from mysql-5.1
Diffstat (limited to 'sql/item_strfunc.h')
| -rw-r--r-- | sql/item_strfunc.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index fef4f9f975d..00a0b35ef58 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -787,9 +787,10 @@ public: String *val_str(String *); void fix_length_and_dec() { - ulonglong max_result_length= (ulonglong) args[0]->max_length * 2 + 2; - max_length= (uint32) min(max_result_length, MAX_BLOB_WIDTH); collation.set(args[0]->collation); + ulonglong max_result_length= (ulonglong) args[0]->max_length * 2 + + 2 * collation.collation->mbmaxlen; + max_length= (uint32) min(max_result_length, MAX_BLOB_WIDTH); } }; |