fixup for MDEV-19160

MariaDB · Jan 12, 2023 · 1792029 · 1792029
1 parent c08dba7
commit 1792029
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/mysql-test/main/func_json.result b/mysql-test/main/func_json.result
@@ -1131,9 +1131,6 @@ SELECT * FROM t1 WHERE CASE WHEN JSON_OBJECT('x', (SELECT MAX(a=2) FROM t1))='{"
 a
 DROP TABLE t1;
 #
-# End of 10.4 tests
-#
-#
 # MDEV-19160 JSON_DETAILED output unnecessarily verbose
 #
 create table t200 (a text);
@@ -1260,3 +1257,6 @@ select JSON_LOOSE(JSON_EXTRACT(a, '$**.analyzing_range_alternatives')) from t200
 JSON_LOOSE(JSON_EXTRACT(a, '$**.analyzing_range_alternatives'))
 [{"range_scan_alternatives": [{"index": "a_b", "ranges": ["2 <= a <= 2 AND 4 <= b <= 4", "123"], "rowid_ordered": true, "using_mrr": false, "index_only": true, "rows": 1, "cost": 1.1752, "chosen": true}], "analyzing_roworder_intersect": {"cause": "too few roworder scans"}, "analyzing_index_merge_union": [], "test_one_line_array": ["123"]}]
 drop table t200;
+#
+# End of 10.4 tests
+#
diff --git a/mysql-test/main/func_json.test b/mysql-test/main/func_json.test
@@ -715,11 +715,6 @@ SELECT * FROM t1 WHERE CASE WHEN JSON_OBJECT('x', (SELECT MAX(a=2) FROM t1))='{"
 
 DROP TABLE t1;
 
---echo #
---echo # End of 10.4 tests
---echo #
-
-
 --echo #
 --echo # MDEV-19160 JSON_DETAILED output unnecessarily verbose
 --echo #
@@ -819,3 +814,7 @@ insert into t200 values
 select JSON_DETAILED(JSON_EXTRACT(a, '$**.analyzing_range_alternatives')) from t200;
 select JSON_LOOSE(JSON_EXTRACT(a, '$**.analyzing_range_alternatives')) from t200;
 drop table t200;
+
+--echo #
+--echo # End of 10.4 tests
+--echo #