Fixing merge conflicts for 10.9 json task and related bugs

f326b43c · Rucha Deodhar · c69d72c2 · f326b43c · f326b43c
Commit f326b43c authored Apr 15, 2022 by Rucha Deodhar
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 94 additions and 2388 deletions

mysql-test/main/func_json.result mysql-test/main/func_json.result +58 -1162

mysql-test/main/func_json.test mysql-test/main/func_json.test +36 -1226

No files found.
--- a/mysql-test/main/func_json.result
+++ b/mysql-test/main/func_json.result
--- a/mysql-test/main/func_json.test
+++ b/mysql-test/main/func_json.test