diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-06-01 21:52:20 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-06-01 21:52:20 +0200 |
| commit | ffc8f62b08982cc1f2fabf8b4b38bd124c115a97 (patch) | |
| tree | da42637b1ae9402a7436b715f9c0db57cdddc87a /sql/item_strfunc.h | |
| parent | 6b157f6be3cb056a93eb925df3880098c871b32a (diff) | |
| parent | 0fc39acb8125fae95062e7b680b022b075a308c3 (diff) | |
| download | mariadb-git-ffc8f62b08982cc1f2fabf8b4b38bd124c115a97.tar.gz | |
merge 5.1->5.2
Diffstat (limited to 'sql/item_strfunc.h')
| -rw-r--r-- | sql/item_strfunc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/item_strfunc.h b/sql/item_strfunc.h index 85cc4b07231..53219e70973 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -707,8 +707,9 @@ 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); - max_length= args[0]->max_length * 2 + 2; } }; |