mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 12:02:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-12732 json.json_no_table fails with valgrind in buildbot and

Browse source 
outside.

        The result_limit variable wasn't always initialized in
        Item_func_json_array::fix_length_and_dec().
This commit is contained in:
Alexey Botchkov 2017-08-08 13:49:29 +04:00
parent bb71d9abf2
commit 01a4eb8f76
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sql/item_jsonfunc.cc
View file

@ -1485,6 +1485,8 @@ void Item_func_json_array::fix_length_and_dec()
ulonglong char_length= 2;
uint n_arg;
result_limit= 0;
if (arg_count == 0)
{
collation.set(&my_charset_utf8_general_ci);
@ -1501,7 +1503,6 @@ void Item_func_json_array::fix_length_and_dec()
fix_char_length_ulonglong(char_length);
tmp_val.set_charset(collation.collation);
result_limit= 0;
}