diff options
| author | Alexander Barkov <bar@mariadb.com> | 2018-07-24 18:44:49 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2018-07-24 18:44:49 +0400 |
| commit | 294a426088bd7167f42388e7e76ff8d42df7d6be (patch) | |
| tree | b6608f7651c83c858cfed3686f8053773511fa99 /sql/item_jsonfunc.cc | |
| parent | f74d2a9faa4b4233433dfcb0d2d14a6b269c48ba (diff) | |
| parent | a8227a154306a818685ab291f1715c3971d03099 (diff) | |
| download | mariadb-git-294a426088bd7167f42388e7e76ff8d42df7d6be.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into 10.3
Diffstat (limited to 'sql/item_jsonfunc.cc')
| -rw-r--r-- | sql/item_jsonfunc.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_jsonfunc.cc b/sql/item_jsonfunc.cc index afcba91d57f..d1c15a0126e 100644 --- a/sql/item_jsonfunc.cc +++ b/sql/item_jsonfunc.cc @@ -575,7 +575,7 @@ bool Item_func_json_quote::fix_length_and_dec() Odd but realistic worst case is when all characters of the argument turn into '\uXXXX\uXXXX', which is 12. */ - max_length= args[0]->max_length * 12 + 2; + fix_char_length_ulonglong((ulonglong) args[0]->max_char_length() * 12 + 2); return FALSE; } |