[Commits] 01a4eb8: MDEV-12732 json.json_no_table fails with valgrind in buildbot and

Alexey Botchkov holyfoot at askmonty.org
Tue Aug 8 12:51:02 EEST 2017


revision-id: 01a4eb8f761eb669fe2ae5139c73a7434b141a8f (mariadb-10.2.7-52-g01a4eb8)
parent(s): bb71d9abf26aa5a0f8bb703d4541e3c064eed003
committer: Alexey Botchkov
timestamp: 2017-08-08 13:49:29 +0400
message:

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

        The result_limit variable wasn't always initialized in
        Item_func_json_array::fix_length_and_dec().

---
 sql/item_jsonfunc.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sql/item_jsonfunc.cc b/sql/item_jsonfunc.cc
index 3f00177..315443f 100644
--- a/sql/item_jsonfunc.cc
+++ b/sql/item_jsonfunc.cc
@@ -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;
 }
 
 


More information about the commits mailing list