diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2016-11-16 12:47:46 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2016-11-16 12:47:46 +0400 |
| commit | 0d85124da4f7084de724ae8267c66a6ffd0f2b98 (patch) | |
| tree | 392d6675d979658c91d6539c6ab064c14463d123 | |
| parent | 0b869814dc98a961e21f4e0d2a581f52b80543a6 (diff) | |
| download | mariadb-git-0d85124da4f7084de724ae8267c66a6ffd0f2b98.tar.gz | |
func_json.test failing on Windows fixed.
| -rw-r--r-- | sql/item_jsonfunc.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/item_jsonfunc.cc b/sql/item_jsonfunc.cc index 4fa2f02bedc..e0ff7b4507a 100644 --- 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); |