func_json.test failing on Windows fixed.

0d85124d · Alexey Botchkov · 0b869814 · 0d85124d
Commit 0d85124d authored Nov 16, 2016 by Alexey Botchkov
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

sql/item_jsonfunc.cc sql/item_jsonfunc.cc +4 -4

No files found.
--- a/sql/item_jsonfunc.cc
+++ b/sql/item_jsonfunc.cc
@@ -922,8 +922,8 @@ void Item_func_json_array_append::fix_length_and_dec()

  for (n_arg= 1; n_arg < arg_count; n_arg+= 2)
  {
-    paths[n_arg-1].set_constant_flag(args[n_arg]->const_item());
-    char_length+= args[n_arg+1]->max_char_length() + 4;
+    paths[n_arg/2].set_constant_flag(args[n_arg]->const_item());
+    char_length+= args[n_arg/2+1]->max_char_length() + 4;
  }

  fix_char_length_ulonglong(char_length);
@@ -1323,8 +1323,8 @@ void Item_func_json_insert::fix_length_and_dec()

  for (n_arg= 1; n_arg < arg_count; n_arg+= 2)
  {
-    paths[n_arg-1].set_constant_flag(args[n_arg]->const_item());
-    char_length+= args[n_arg+1]->max_char_length() + 4;
+    paths[n_arg/2].set_constant_flag(args[n_arg]->const_item());
+    char_length+= args[n_arg/2+1]->max_char_length() + 4;
  }

  fix_char_length_ulonglong(char_length);