diff options
| author | Kent Boortz <kent.boortz@oracle.com> | 2011-07-03 17:47:37 +0200 |
|---|---|---|
| committer | Kent Boortz <kent.boortz@oracle.com> | 2011-07-03 17:47:37 +0200 |
| commit | 027b5f1ed4f0130bbbc174eb45162a402c65f43f (patch) | |
| tree | 448d397ed328f719a29a8fbbd54df8d943ed7274 /sql/item_strfunc.h | |
| parent | 68f00a56868c5ca21b2d51598e1a43969ecf4896 (diff) | |
| parent | dd4957965411c1b67ebfb1ba8650a3090d305f63 (diff) | |
| download | mariadb-git-027b5f1ed4f0130bbbc174eb45162a402c65f43f.tar.gz | |
Updated/added copyright headers
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 4cdad9e3f1f..b5aa804e17b 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -706,9 +706,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); } }; |