diff options
| author | unknown <knielsen@knielsen-hq.org> | 2010-05-31 10:43:34 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2010-05-31 10:43:34 +0200 |
| commit | 0fc39acb8125fae95062e7b680b022b075a308c3 (patch) | |
| tree | cf991484ab999e60eb9b33d81733fca16b368cf9 /sql/item_strfunc.h | |
| parent | e6eab96555d8cf70cbe6c8a94956855a0b5eca43 (diff) | |
| parent | 80ba8556e772fd7e4eb369c64bb32ca44f93e221 (diff) | |
| download | mariadb-git-0fc39acb8125fae95062e7b680b022b075a308c3.tar.gz | |
Automerge MariaDB 5.1.47 release into main.
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 59e7c0df5b6..0a6375e80a5 100644 --- a/sql/item_strfunc.h +++ b/sql/item_strfunc.h @@ -694,8 +694,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; } }; |