diff --git a/mysql-test/columnstore/autopilot/r/mcs6722_json_JSON_ARRAY_APPEND_KnownIssue.result b/mysql-test/columnstore/autopilot/r/mcs6722_json_JSON_ARRAY_APPEND.result
similarity index 65%
rename from mysql-test/columnstore/autopilot/r/mcs6722_json_JSON_ARRAY_APPEND_KnownIssue.result
rename to mysql-test/columnstore/autopilot/r/mcs6722_json_JSON_ARRAY_APPEND.result
index 3a99c2573..9f4b5a862 100644
--- a/mysql-test/columnstore/autopilot/r/mcs6722_json_JSON_ARRAY_APPEND_KnownIssue.result
+++ b/mysql-test/columnstore/autopilot/r/mcs6722_json_JSON_ARRAY_APPEND.result
@@ -21,13 +21,17 @@ SELECT * FROM jsontest;
 cInt	cVarchar	cText
 1	[1, 2, [3, 4]]	[1, 2, [3, 4]]
 SELECT cVarchar, JSON_ARRAY_APPEND(cVarchar, '$[0]', 5), cText, JSON_ARRAY_APPEND(cText, '$[0]', 5) from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_array_append' isn't supported.
+cVarchar	JSON_ARRAY_APPEND(cVarchar, '$[0]', 5)	cText	JSON_ARRAY_APPEND(cText, '$[0]', 5)
+[1, 2, [3, 4]]	[[1, 5], 2, [3, 4]]	[1, 2, [3, 4]]	[[1, 5], 2, [3, 4]]
 SELECT cVarchar, JSON_ARRAY_APPEND(cVarchar, '$[1]', 6), cText, JSON_ARRAY_APPEND(cText, '$[1]', 6) from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_array_append' isn't supported.
+cVarchar	JSON_ARRAY_APPEND(cVarchar, '$[1]', 6)	cText	JSON_ARRAY_APPEND(cText, '$[1]', 6)
+[1, 2, [3, 4]]	[1, [2, 6], [3, 4]]	[1, 2, [3, 4]]	[1, [2, 6], [3, 4]]
 SELECT cVarchar, JSON_ARRAY_APPEND(cVarchar, '$[1]', 6, '$[2]', 7), cText, JSON_ARRAY_APPEND(cText, '$[1]', 6, '$[2]', 7) from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_array_append' isn't supported.
+cVarchar	JSON_ARRAY_APPEND(cVarchar, '$[1]', 6, '$[2]', 7)	cText	JSON_ARRAY_APPEND(cText, '$[1]', 6, '$[2]', 7)
+[1, 2, [3, 4]]	[1, [2, 6], [3, 4, 7]]	[1, 2, [3, 4]]	[1, [2, 6], [3, 4, 7]]
 SELECT cVarchar, JSON_ARRAY_APPEND(cVarchar, '$', 5), cText, JSON_ARRAY_APPEND(cText, '$', 5) from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_array_append' isn't supported.
+cVarchar	JSON_ARRAY_APPEND(cVarchar, '$', 5)	cText	JSON_ARRAY_APPEND(cText, '$', 5)
+[1, 2, [3, 4]]	[1, 2, [3, 4], 5]	[1, 2, [3, 4]]	[1, 2, [3, 4], 5]
 TRUNCATE TABLE jsontest;
 SET @json = '{"A": 1, "B": [2], "C": [3, 4]}';
 SELECT @json;
@@ -41,5 +45,6 @@ SELECT * FROM jsontest;
 cInt	cVarchar	cText
 1	{"A": 1, "B": [2], "C": [3, 4]}	{"A": 1, "B": [2], "C": [3, 4]}
 SELECT cVarchar, JSON_ARRAY_APPEND(cVarchar, '$.B', 5), cText, JSON_ARRAY_APPEND(cText, '$.B', 5) from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_array_append' isn't supported.
+cVarchar	JSON_ARRAY_APPEND(cVarchar, '$.B', 5)	cText	JSON_ARRAY_APPEND(cText, '$.B', 5)
+{"A": 1, "B": [2], "C": [3, 4]}	{"A": 1, "B": [2, 5], "C": [3, 4]}	{"A": 1, "B": [2], "C": [3, 4]}	{"A": 1, "B": [2, 5], "C": [3, 4]}
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/r/mcs6723_json_JSON_ARRAY_INSERT_KnownIssue.result b/mysql-test/columnstore/autopilot/r/mcs6723_json_JSON_ARRAY_INSERT.result
similarity index 65%
rename from mysql-test/columnstore/autopilot/r/mcs6723_json_JSON_ARRAY_INSERT_KnownIssue.result
rename to mysql-test/columnstore/autopilot/r/mcs6723_json_JSON_ARRAY_INSERT.result
index a4f6facb4..5f30c68b5 100644
--- a/mysql-test/columnstore/autopilot/r/mcs6723_json_JSON_ARRAY_INSERT_KnownIssue.result
+++ b/mysql-test/columnstore/autopilot/r/mcs6723_json_JSON_ARRAY_INSERT.result
@@ -18,9 +18,12 @@ SELECT * FROM jsontest;
 cInt	cVarchar	cText
 1	[1, 2, [3, 4]]	[1, 2, [3, 4]]
 SELECT cVarchar, JSON_ARRAY_INSERT(cVarchar, '$[0]', 5), cText, JSON_ARRAY_INSERT(cText, '$[0]', 5) from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_array_insert' isn't supported.
+cVarchar	JSON_ARRAY_INSERT(cVarchar, '$[0]', 5)	cText	JSON_ARRAY_INSERT(cText, '$[0]', 5)
+[1, 2, [3, 4]]	[5, 1, 2, [3, 4]]	[1, 2, [3, 4]]	[5, 1, 2, [3, 4]]
 SELECT cVarchar, JSON_ARRAY_INSERT(cVarchar, '$[1]', 6), cText, JSON_ARRAY_INSERT(cText, '$[1]', 6) from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_array_insert' isn't supported.
+cVarchar	JSON_ARRAY_INSERT(cVarchar, '$[1]', 6)	cText	JSON_ARRAY_INSERT(cText, '$[1]', 6)
+[1, 2, [3, 4]]	[1, 6, 2, [3, 4]]	[1, 2, [3, 4]]	[1, 6, 2, [3, 4]]
 SELECT cVarchar, JSON_ARRAY_INSERT(cVarchar, '$[1]', 6, '$[2]', 7), cText, JSON_ARRAY_INSERT(cText, '$[1]', 6, '$[2]', 7) from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_array_insert' isn't supported.
+cVarchar	JSON_ARRAY_INSERT(cVarchar, '$[1]', 6, '$[2]', 7)	cText	JSON_ARRAY_INSERT(cText, '$[1]', 6, '$[2]', 7)
+[1, 2, [3, 4]]	[1, 6, 7, 2, [3, 4]]	[1, 2, [3, 4]]	[1, 6, 7, 2, [3, 4]]
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/r/mcs6724_json_JSON_COMPACT_KnownIssue.result b/mysql-test/columnstore/autopilot/r/mcs6724_json_JSON_COMPACT.result
similarity index 77%
rename from mysql-test/columnstore/autopilot/r/mcs6724_json_JSON_COMPACT_KnownIssue.result
rename to mysql-test/columnstore/autopilot/r/mcs6724_json_JSON_COMPACT.result
index 2e24b9125..a1d70d285 100644
--- a/mysql-test/columnstore/autopilot/r/mcs6724_json_JSON_COMPACT_KnownIssue.result
+++ b/mysql-test/columnstore/autopilot/r/mcs6724_json_JSON_COMPACT.result
@@ -12,5 +12,6 @@ SELECT * FROM jsontest;
 cInt	cVarchar	cText
 1	{ "A": 1, "B": [2, 3]}	{ "A": 1, "B": [2, 3]}
 SELECT cVarchar, JSON_COMPACT(cVarchar), cText, JSON_COMPACT(cText) from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_compact' isn't supported.
+cVarchar	JSON_COMPACT(cVarchar)	cText	JSON_COMPACT(cText)
+{ "A": 1, "B": [2, 3]}	{"A":1,"B":[2,3]}	{ "A": 1, "B": [2, 3]}	{"A":1,"B":[2,3]}
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/r/mcs6725_json_JSON_CONTAINS_KnownIssue.result b/mysql-test/columnstore/autopilot/r/mcs6725_json_JSON_CONTAINS.result
similarity index 63%
rename from mysql-test/columnstore/autopilot/r/mcs6725_json_JSON_CONTAINS_KnownIssue.result
rename to mysql-test/columnstore/autopilot/r/mcs6725_json_JSON_CONTAINS.result
index 03e049eee..7516973e1 100644
--- a/mysql-test/columnstore/autopilot/r/mcs6725_json_JSON_CONTAINS_KnownIssue.result
+++ b/mysql-test/columnstore/autopilot/r/mcs6725_json_JSON_CONTAINS.result
@@ -21,11 +21,15 @@ SELECT * FROM jsontest;
 cInt	cVarchar	cText
 1	{"A": 0, "B": {"C": 1}, "D": 2}	{"A": 0, "B": {"C": 1}, "D": 2}
 SELECT cVarchar, JSON_CONTAINS(cVarchar, '2', '$.A'), cText, JSON_CONTAINS(cText, '2', '$.A') from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_contains' isn't supported.
+cVarchar	JSON_CONTAINS(cVarchar, '2', '$.A')	cText	JSON_CONTAINS(cText, '2', '$.A')
+{"A": 0, "B": {"C": 1}, "D": 2}	0	{"A": 0, "B": {"C": 1}, "D": 2}	0
 SELECT cVarchar, JSON_CONTAINS(cVarchar, '2', '$.D'), cText, JSON_CONTAINS(cText, '2', '$.D') from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_contains' isn't supported.
+cVarchar	JSON_CONTAINS(cVarchar, '2', '$.D')	cText	JSON_CONTAINS(cText, '2', '$.D')
+{"A": 0, "B": {"C": 1}, "D": 2}	1	{"A": 0, "B": {"C": 1}, "D": 2}	1
 SELECT cVarchar, JSON_CONTAINS(cVarchar, '{"C": 1}', '$.A'), cText, JSON_CONTAINS(cText, '{"C": 1}', '$.A') from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_contains' isn't supported.
+cVarchar	JSON_CONTAINS(cVarchar, '{"C": 1}', '$.A')	cText	JSON_CONTAINS(cText, '{"C": 1}', '$.A')
+{"A": 0, "B": {"C": 1}, "D": 2}	0	{"A": 0, "B": {"C": 1}, "D": 2}	0
 SELECT cVarchar, JSON_CONTAINS(cVarchar, '{"C": 1}', '$.B'), cText, JSON_CONTAINS(cText, '{"C": 1}', '$.B') from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_contains' isn't supported.
+cVarchar	JSON_CONTAINS(cVarchar, '{"C": 1}', '$.B')	cText	JSON_CONTAINS(cText, '{"C": 1}', '$.B')
+{"A": 0, "B": {"C": 1}, "D": 2}	1	{"A": 0, "B": {"C": 1}, "D": 2}	1
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/r/mcs6726_json_JSON_CONTAINS_PATH_KnownIssue.result b/mysql-test/columnstore/autopilot/r/mcs6726_json_JSON_CONTAINS_PATH.result
similarity index 69%
rename from mysql-test/columnstore/autopilot/r/mcs6726_json_JSON_CONTAINS_PATH_KnownIssue.result
rename to mysql-test/columnstore/autopilot/r/mcs6726_json_JSON_CONTAINS_PATH.result
index 0aa40aec0..4dc5627cc 100644
--- a/mysql-test/columnstore/autopilot/r/mcs6726_json_JSON_CONTAINS_PATH_KnownIssue.result
+++ b/mysql-test/columnstore/autopilot/r/mcs6726_json_JSON_CONTAINS_PATH.result
@@ -15,7 +15,9 @@ SELECT * FROM jsontest;
 cInt	cVarchar	cText
 1	{"A": 1, "B": [2], "C": [3, 4]}	{"A": 1, "B": [2], "C": [3, 4]}
 SELECT cVarchar, JSON_CONTAINS_PATH(cVarchar, 'one', '$.A', '$.D'), cText, JSON_CONTAINS_PATH(cText, 'one', '$.A', '$.D') from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_contains_path' isn't supported.
+cVarchar	JSON_CONTAINS_PATH(cVarchar, 'one', '$.A', '$.D')	cText	JSON_CONTAINS_PATH(cText, 'one', '$.A', '$.D')
+{"A": 1, "B": [2], "C": [3, 4]}	1	{"A": 1, "B": [2], "C": [3, 4]}	1
 SELECT cVarchar, JSON_CONTAINS_PATH(cVarchar, 'all', '$.A', '$.D'), cText, JSON_CONTAINS_PATH(cText, 'all', '$.A', '$.D') from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_contains_path' isn't supported.
+cVarchar	JSON_CONTAINS_PATH(cVarchar, 'all', '$.A', '$.D')	cText	JSON_CONTAINS_PATH(cText, 'all', '$.A', '$.D')
+{"A": 1, "B": [2], "C": [3, 4]}	0	{"A": 1, "B": [2], "C": [3, 4]}	0
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/r/mcs6727_json_JSON_DEPTH_KnownIssue.result b/mysql-test/columnstore/autopilot/r/mcs6727_json_JSON_DEPTH.result
similarity index 82%
rename from mysql-test/columnstore/autopilot/r/mcs6727_json_JSON_DEPTH_KnownIssue.result
rename to mysql-test/columnstore/autopilot/r/mcs6727_json_JSON_DEPTH.result
index 4a439049d..c801f77f8 100644
--- a/mysql-test/columnstore/autopilot/r/mcs6727_json_JSON_DEPTH_KnownIssue.result
+++ b/mysql-test/columnstore/autopilot/r/mcs6727_json_JSON_DEPTH.result
@@ -21,5 +21,11 @@ cInt	cVarchar	cText
 5	[[], {}, []]	[[], {}, []]
 6	[1, 2, [3, 4, 5, 6], 7]	[1, 2, [3, 4, 5, 6], 7]
 SELECT cVarchar, JSON_DEPTH(cVarchar), cText, JSON_DEPTH(cText) from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_depth' isn't supported.
+cVarchar	JSON_DEPTH(cVarchar)	cText	JSON_DEPTH(cText)
+[]	1	[]	1
+true	1	true	1
+{}	1	{}	1
+[1, 2, 3]	2	[1, 2, 3]	2
+[[], {}, []]	2	[[], {}, []]	2
+[1, 2, [3, 4, 5, 6], 7]	3	[1, 2, [3, 4, 5, 6], 7]	3
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/r/mcs6729_json_JSON_EXISTS_KnownIssue.result b/mysql-test/columnstore/autopilot/r/mcs6729_json_JSON_EXISTS.result
similarity index 63%
rename from mysql-test/columnstore/autopilot/r/mcs6729_json_JSON_EXISTS_KnownIssue.result
rename to mysql-test/columnstore/autopilot/r/mcs6729_json_JSON_EXISTS.result
index 8d767f6f1..46546fb79 100644
--- a/mysql-test/columnstore/autopilot/r/mcs6729_json_JSON_EXISTS_KnownIssue.result
+++ b/mysql-test/columnstore/autopilot/r/mcs6729_json_JSON_EXISTS.result
@@ -21,11 +21,15 @@ SELECT * FROM jsontest;
 cInt	cVarchar	cText
 1	{"key1":"xxxx", "key2":[1, 2, 3]}	{"key1":"xxxx", "key2":[1, 2, 3]}
 SELECT cVarchar, JSON_EXISTS(cVarchar, "$.key2"), cText, JSON_EXISTS(cText, "$.key2") from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_exists' isn't supported.
+cVarchar	JSON_EXISTS(cVarchar, "$.key2")	cText	JSON_EXISTS(cText, "$.key2")
+{"key1":"xxxx", "key2":[1, 2, 3]}	1	{"key1":"xxxx", "key2":[1, 2, 3]}	1
 SELECT cVarchar, JSON_EXISTS(cVarchar, "$.key3"), cText, JSON_EXISTS(cText, "$.key3") from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_exists' isn't supported.
+cVarchar	JSON_EXISTS(cVarchar, "$.key3")	cText	JSON_EXISTS(cText, "$.key3")
+{"key1":"xxxx", "key2":[1, 2, 3]}	0	{"key1":"xxxx", "key2":[1, 2, 3]}	0
 SELECT cVarchar, JSON_EXISTS(cVarchar, "$.key2[1]"), cText, JSON_EXISTS(cText, "$.key2[1]") from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_exists' isn't supported.
+cVarchar	JSON_EXISTS(cVarchar, "$.key2[1]")	cText	JSON_EXISTS(cText, "$.key2[1]")
+{"key1":"xxxx", "key2":[1, 2, 3]}	1	{"key1":"xxxx", "key2":[1, 2, 3]}	1
 SELECT cVarchar, JSON_EXISTS(cVarchar, "$.key2[10]"), cText, JSON_EXISTS(cText, "$.key2[10]") from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_exists' isn't supported.
+cVarchar	JSON_EXISTS(cVarchar, "$.key2[10]")	cText	JSON_EXISTS(cText, "$.key2[10]")
+{"key1":"xxxx", "key2":[1, 2, 3]}	0	{"key1":"xxxx", "key2":[1, 2, 3]}	0
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/r/mcs6730_json_JSON_EXTRACT_KnownIssue.result b/mysql-test/columnstore/autopilot/r/mcs6730_json_JSON_EXTRACT.result
similarity index 69%
rename from mysql-test/columnstore/autopilot/r/mcs6730_json_JSON_EXTRACT_KnownIssue.result
rename to mysql-test/columnstore/autopilot/r/mcs6730_json_JSON_EXTRACT.result
index 67633538b..d20b30273 100644
--- a/mysql-test/columnstore/autopilot/r/mcs6730_json_JSON_EXTRACT_KnownIssue.result
+++ b/mysql-test/columnstore/autopilot/r/mcs6730_json_JSON_EXTRACT.result
@@ -18,9 +18,12 @@ SELECT * FROM jsontest;
 cInt	cVarchar	cText
 1	[1, 2, [3, 4]]	[1, 2, [3, 4]]
 SELECT cVarchar, JSON_EXTRACT(cVarchar, '$[1]'), cText, JSON_EXTRACT(cText, '$[1]') from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_extract' isn't supported.
+cVarchar	JSON_EXTRACT(cVarchar, '$[1]')	cText	JSON_EXTRACT(cText, '$[1]')
+[1, 2, [3, 4]]	2	[1, 2, [3, 4]]	2
 SELECT cVarchar, JSON_EXTRACT(cVarchar, '$[2]'), cText, JSON_EXTRACT(cText, '$[2]') from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_extract' isn't supported.
+cVarchar	JSON_EXTRACT(cVarchar, '$[2]')	cText	JSON_EXTRACT(cText, '$[2]')
+[1, 2, [3, 4]]	[3, 4]	[1, 2, [3, 4]]	[3, 4]
 SELECT cVarchar, JSON_EXTRACT(cVarchar, '$[2][1]'), cText, JSON_EXTRACT(cText, '$[2][1]') from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_extract' isn't supported.
+cVarchar	JSON_EXTRACT(cVarchar, '$[2][1]')	cText	JSON_EXTRACT(cText, '$[2][1]')
+[1, 2, [3, 4]]	4	[1, 2, [3, 4]]	4
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/r/mcs6731_json_JSON_INSERT_KnownIssue.result b/mysql-test/columnstore/autopilot/r/mcs6731_json_JSON_INSERT.result
similarity index 71%
rename from mysql-test/columnstore/autopilot/r/mcs6731_json_JSON_INSERT_KnownIssue.result
rename to mysql-test/columnstore/autopilot/r/mcs6731_json_JSON_INSERT.result
index d3f9dd6cc..73cc157bd 100644
--- a/mysql-test/columnstore/autopilot/r/mcs6731_json_JSON_INSERT_KnownIssue.result
+++ b/mysql-test/columnstore/autopilot/r/mcs6731_json_JSON_INSERT.result
@@ -12,5 +12,6 @@ SELECT * FROM jsontest;
 cInt	cVarchar	cText
 1	{ "A": 0, "B": [1, 2]}	{ "A": 0, "B": [1, 2]}
 SELECT cVarchar, JSON_INSERT(cVarchar, '$.C', '[3, 4]'), cText, JSON_INSERT(cText, '$.C', '[3, 4]') from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_insert' isn't supported.
+cVarchar	JSON_INSERT(cVarchar, '$.C', '[3, 4]')	cText	JSON_INSERT(cText, '$.C', '[3, 4]')
+{ "A": 0, "B": [1, 2]}	{"A": 0, "B": [1, 2], "C": "[3, 4]"}	{ "A": 0, "B": [1, 2]}	{"A": 0, "B": [1, 2], "C": "[3, 4]"}
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/r/mcs6732_json_JSON_KEYS_KnownIssue.result b/mysql-test/columnstore/autopilot/r/mcs6732_json_JSON_KEYS.result
similarity index 68%
rename from mysql-test/columnstore/autopilot/r/mcs6732_json_JSON_KEYS_KnownIssue.result
rename to mysql-test/columnstore/autopilot/r/mcs6732_json_JSON_KEYS.result
index 29b363a0e..df588c17c 100644
--- a/mysql-test/columnstore/autopilot/r/mcs6732_json_JSON_KEYS_KnownIssue.result
+++ b/mysql-test/columnstore/autopilot/r/mcs6732_json_JSON_KEYS.result
@@ -21,7 +21,11 @@ cInt	cVarchar	cText
 1	{"A": 1, "B": {"C": 2}}	{"A": 1, "B": {"C": 2}}
 1	{"A": 1, "B": 2, "C": {"D": 3}}	{"A": 1, "B": 2, "C": {"D": 3}}
 SELECT cVarchar, JSON_KEYS(cVarchar), cText, JSON_KEYS(cText) from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_keys' isn't supported.
+cVarchar	JSON_KEYS(cVarchar)	cText	JSON_KEYS(cText)
+{"A": 1, "B": {"C": 2}}	["A", "B"]	{"A": 1, "B": {"C": 2}}	["A", "B"]
+{"A": 1, "B": 2, "C": {"D": 3}}	["A", "B", "C"]	{"A": 1, "B": 2, "C": {"D": 3}}	["A", "B", "C"]
 SELECT cVarchar, JSON_KEYS(cVarchar, '$.C'), cText, JSON_KEYS(cText, '$.C') from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_keys' isn't supported.
+cVarchar	JSON_KEYS(cVarchar, '$.C')	cText	JSON_KEYS(cText, '$.C')
+{"A": 1, "B": {"C": 2}}	NULL	{"A": 1, "B": {"C": 2}}	NULL
+{"A": 1, "B": 2, "C": {"D": 3}}	["D"]	{"A": 1, "B": 2, "C": {"D": 3}}	["D"]
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/r/mcs6733_json_JSON_LENGTH_KnownIssue.result b/mysql-test/columnstore/autopilot/r/mcs6733_json_JSON_LENGTH.result
similarity index 71%
rename from mysql-test/columnstore/autopilot/r/mcs6733_json_JSON_LENGTH_KnownIssue.result
rename to mysql-test/columnstore/autopilot/r/mcs6733_json_JSON_LENGTH.result
index a60a76fce..8c0a16514 100644
--- a/mysql-test/columnstore/autopilot/r/mcs6733_json_JSON_LENGTH_KnownIssue.result
+++ b/mysql-test/columnstore/autopilot/r/mcs6733_json_JSON_LENGTH.result
@@ -24,7 +24,11 @@ cInt	cVarchar	cText
 1	[1, 2, {"a": 3}]	[1, 2, {"a": 3}]
 2	{"a": 1, "b": {"c": 30}}	{"a": 1, "b": {"c": 30}}
 SELECT cVarchar, JSON_LENGTH(cVarchar), cText, JSON_LENGTH(cText) from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_length' isn't supported.
+cVarchar	JSON_LENGTH(cVarchar)	cText	JSON_LENGTH(cText)
+[1, 2, {"a": 3}]	3	[1, 2, {"a": 3}]	3
+{"a": 1, "b": {"c": 30}}	2	{"a": 1, "b": {"c": 30}}	2
 SELECT cVarchar, JSON_LENGTH(cVarchar, '$.b'), cText, JSON_LENGTH(cText, '$.b') from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_length' isn't supported.
+cVarchar	JSON_LENGTH(cVarchar, '$.b')	cText	JSON_LENGTH(cText, '$.b')
+[1, 2, {"a": 3}]	NULL	[1, 2, {"a": 3}]	NULL
+{"a": 1, "b": {"c": 30}}	1	{"a": 1, "b": {"c": 30}}	1
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/r/mcs6734_json_JSON_LOOSE_KnownIssue.result b/mysql-test/columnstore/autopilot/r/mcs6734_json_JSON_LOOSE.result
similarity index 75%
rename from mysql-test/columnstore/autopilot/r/mcs6734_json_JSON_LOOSE_KnownIssue.result
rename to mysql-test/columnstore/autopilot/r/mcs6734_json_JSON_LOOSE.result
index a3993a580..6ea470201 100644
--- a/mysql-test/columnstore/autopilot/r/mcs6734_json_JSON_LOOSE_KnownIssue.result
+++ b/mysql-test/columnstore/autopilot/r/mcs6734_json_JSON_LOOSE.result
@@ -12,5 +12,6 @@ SELECT * FROM jsontest;
 cInt	cVarchar	cText
 1	{ "A":1,"B":[2,3]}	{ "A":1,"B":[2,3]}
 SELECT cVarchar, JSON_LOOSE(cVarchar), cText, JSON_LOOSE(cText) from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_loose' isn't supported.
+cVarchar	JSON_LOOSE(cVarchar)	cText	JSON_LOOSE(cText)
+{ "A":1,"B":[2,3]}	{"A": 1, "B": [2, 3]}	{ "A":1,"B":[2,3]}	{"A": 1, "B": [2, 3]}
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/r/mcs6735_json_JSON_MERGE_KnownIssue.result b/mysql-test/columnstore/autopilot/r/mcs6735_json_JSON_MERGE.result
similarity index 66%
rename from mysql-test/columnstore/autopilot/r/mcs6735_json_JSON_MERGE_KnownIssue.result
rename to mysql-test/columnstore/autopilot/r/mcs6735_json_JSON_MERGE.result
index 1cc5312ea..7193b44e0 100644
--- a/mysql-test/columnstore/autopilot/r/mcs6735_json_JSON_MERGE_KnownIssue.result
+++ b/mysql-test/columnstore/autopilot/r/mcs6735_json_JSON_MERGE.result
@@ -18,7 +18,11 @@ cInt	cVarchar	cText
 1	[1, 2]	[1, 2]
 1	[3, 4]	[3, 4]
 SELECT cVarchar, JSON_MERGE(cVarchar, @json2), cText, JSON_MERGE(cText, @json2) from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_merge_preserve' isn't supported.
+cVarchar	JSON_MERGE(cVarchar, @json2)	cText	JSON_MERGE(cText, @json2)
+[1, 2]	[1, 2, 3, 4]	[1, 2]	[1, 2, 3, 4]
+[3, 4]	[3, 4, 3, 4]	[3, 4]	[3, 4, 3, 4]
 SELECT cVarchar, JSON_MERGE(cVarchar, cText), cText, JSON_MERGE(cText, cVarchar) from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_merge_preserve' isn't supported.
+cVarchar	JSON_MERGE(cVarchar, cText)	cText	JSON_MERGE(cText, cVarchar)
+[1, 2]	[1, 2, 1, 2]	[1, 2]	[1, 2, 1, 2]
+[3, 4]	[3, 4, 3, 4]	[3, 4]	[3, 4, 3, 4]
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/r/mcs6737_json_JSON_QUERY_KnownIssue.result b/mysql-test/columnstore/autopilot/r/mcs6737_json_JSON_QUERY.result
similarity index 76%
rename from mysql-test/columnstore/autopilot/r/mcs6737_json_JSON_QUERY_KnownIssue.result
rename to mysql-test/columnstore/autopilot/r/mcs6737_json_JSON_QUERY.result
index 9ad480149..5608ecbe0 100644
--- a/mysql-test/columnstore/autopilot/r/mcs6737_json_JSON_QUERY_KnownIssue.result
+++ b/mysql-test/columnstore/autopilot/r/mcs6737_json_JSON_QUERY.result
@@ -21,5 +21,7 @@ cInt	cVarchar	cText
 1	{"key1":{"a":1, "b":[1,2]}}	{"key1":{"a":1, "b":[1,2]}}
 1	{"key1":123, "key1": [1,2,3]}	{"key1":123, "key1": [1,2,3]}
 SELECT cVarchar, JSON_QUERY(cVarchar, '$.key1'), cText, JSON_QUERY(cText, '$.key1') from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_query' isn't supported.
+cVarchar	JSON_QUERY(cVarchar, '$.key1')	cText	JSON_QUERY(cText, '$.key1')
+{"key1":{"a":1, "b":[1,2]}}	{"a":1, "b":[1,2]}	{"key1":{"a":1, "b":[1,2]}}	{"a":1, "b":[1,2]}
+{"key1":123, "key1": [1,2,3]}	[1,2,3]	{"key1":123, "key1": [1,2,3]}	[1,2,3]
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/r/mcs6739_json_JSON_REMOVE_KnownIssue.result b/mysql-test/columnstore/autopilot/r/mcs6739_json_JSON_REMOVE.result
similarity index 59%
rename from mysql-test/columnstore/autopilot/r/mcs6739_json_JSON_REMOVE_KnownIssue.result
rename to mysql-test/columnstore/autopilot/r/mcs6739_json_JSON_REMOVE.result
index a12e5e4e7..03a7c4134 100644
--- a/mysql-test/columnstore/autopilot/r/mcs6739_json_JSON_REMOVE_KnownIssue.result
+++ b/mysql-test/columnstore/autopilot/r/mcs6739_json_JSON_REMOVE.result
@@ -20,7 +20,11 @@ cInt	cVarchar	cText
 1	{"A": 1, "B": 2, "C": {"D": 3}}	{"A": 1, "B": 2, "C": {"D": 3}}
 2	["A", "B", ["C", "D"], "E"]	["A", "B", ["C", "D"], "E"]
 SELECT cVarchar, JSON_REMOVE(cVarchar, '$.C'), cText, JSON_REMOVE(cText, '$.C') from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_remove' isn't supported.
+cVarchar	JSON_REMOVE(cVarchar, '$.C')	cText	JSON_REMOVE(cText, '$.C')
+{"A": 1, "B": 2, "C": {"D": 3}}	{"A": 1, "B": 2}	{"A": 1, "B": 2, "C": {"D": 3}}	{"A": 1, "B": 2}
+["A", "B", ["C", "D"], "E"]	["A", "B", ["C", "D"], "E"]	["A", "B", ["C", "D"], "E"]	["A", "B", ["C", "D"], "E"]
 SELECT cVarchar, JSON_REMOVE(cVarchar, '$[1]'), cText, JSON_REMOVE(cText, '$[1]') from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_remove' isn't supported.
+cVarchar	JSON_REMOVE(cVarchar, '$[1]')	cText	JSON_REMOVE(cText, '$[1]')
+{"A": 1, "B": 2, "C": {"D": 3}}	{"A": 1, "B": 2, "C": {"D": 3}}	{"A": 1, "B": 2, "C": {"D": 3}}	{"A": 1, "B": 2, "C": {"D": 3}}
+["A", "B", ["C", "D"], "E"]	["A", ["C", "D"], "E"]	["A", "B", ["C", "D"], "E"]	["A", ["C", "D"], "E"]
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/r/mcs6740_json_JSON_REPLACE.result b/mysql-test/columnstore/autopilot/r/mcs6740_json_JSON_REPLACE.result
index 123b9c77d..6a0551e3d 100644
--- a/mysql-test/columnstore/autopilot/r/mcs6740_json_JSON_REPLACE.result
+++ b/mysql-test/columnstore/autopilot/r/mcs6740_json_JSON_REPLACE.result
@@ -12,5 +12,6 @@ SELECT * FROM jsontest;
 cInt	cVarchar	cText
 1	{ "A": 1, "B": [2, 3]}	{ "A": 1, "B": [2, 3]}
 SELECT cVarchar, JSON_REPLACE(cVarchar, '$.B[1]', 4), cText, JSON_REPLACE(cText, '$.B[1]', 4) from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_replace' isn't supported.
+cVarchar	JSON_REPLACE(cVarchar, '$.B[1]', 4)	cText	JSON_REPLACE(cText, '$.B[1]', 4)
+{ "A": 1, "B": [2, 3]}	{"A": 1, "B": [2, 4]}	{ "A": 1, "B": [2, 3]}	{"A": 1, "B": [2, 4]}
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/r/mcs6741_json_JSON_SEARCH_KnownIssue.result b/mysql-test/columnstore/autopilot/r/mcs6741_json_JSON_SEARCH.result
similarity index 74%
rename from mysql-test/columnstore/autopilot/r/mcs6741_json_JSON_SEARCH_KnownIssue.result
rename to mysql-test/columnstore/autopilot/r/mcs6741_json_JSON_SEARCH.result
index 0de4797a4..8792cc3bc 100644
--- a/mysql-test/columnstore/autopilot/r/mcs6741_json_JSON_SEARCH_KnownIssue.result
+++ b/mysql-test/columnstore/autopilot/r/mcs6741_json_JSON_SEARCH.result
@@ -12,5 +12,6 @@ SELECT * FROM jsontest;
 cInt	cVarchar	cText
 1	["A", [{"B": "1"}], {"C":"AB"}, {"D":"BC"}]	["A", [{"B": "1"}], {"C":"AB"}, {"D":"BC"}]
 SELECT cVarchar, JSON_SEARCH(cVarchar, 'one', 'AB'), cText, JSON_SEARCH(cText, 'one', 'AB') from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_search' isn't supported.
+cVarchar	JSON_SEARCH(cVarchar, 'one', 'AB')	cText	JSON_SEARCH(cText, 'one', 'AB')
+["A", [{"B": "1"}], {"C":"AB"}, {"D":"BC"}]	"$[2].C"	["A", [{"B": "1"}], {"C":"AB"}, {"D":"BC"}]	"$[2].C"
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/r/mcs6742_json_JSON_SET_KnownIssue.result b/mysql-test/columnstore/autopilot/r/mcs6742_json_JSON_SET.result
similarity index 69%
rename from mysql-test/columnstore/autopilot/r/mcs6742_json_JSON_SET_KnownIssue.result
rename to mysql-test/columnstore/autopilot/r/mcs6742_json_JSON_SET.result
index a5c126df4..e68daacae 100644
--- a/mysql-test/columnstore/autopilot/r/mcs6742_json_JSON_SET_KnownIssue.result
+++ b/mysql-test/columnstore/autopilot/r/mcs6742_json_JSON_SET.result
@@ -12,5 +12,6 @@ SELECT * FROM jsontest;
 cInt	cVarchar	cText
 1	{ "a": 1, "b": [2, 3]}	{ "a": 1, "b": [2, 3]}
 SELECT cVarchar, JSON_SET(cVarchar,'$.a', 10, '$.c', '[true, false]'), cText, JSON_SET(cText,'$.a', 10, '$.c', '[true, false]') from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_set' isn't supported.
+cVarchar	JSON_SET(cVarchar,'$.a', 10, '$.c', '[true, false]')	cText	JSON_SET(cText,'$.a', 10, '$.c', '[true, false]')
+{ "a": 1, "b": [2, 3]}	{"a": 10, "b": [2, 3], "c": "[true, false]"}	{ "a": 1, "b": [2, 3]}	{"a": 10, "b": [2, 3], "c": "[true, false]"}
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/r/mcs6744_json_JSON_UNQUOTE_KnownIssue.result b/mysql-test/columnstore/autopilot/r/mcs6744_json_JSON_UNQUOTE.result
similarity index 72%
rename from mysql-test/columnstore/autopilot/r/mcs6744_json_JSON_UNQUOTE_KnownIssue.result
rename to mysql-test/columnstore/autopilot/r/mcs6744_json_JSON_UNQUOTE.result
index c7561c89a..f46df1665 100644
--- a/mysql-test/columnstore/autopilot/r/mcs6744_json_JSON_UNQUOTE_KnownIssue.result
+++ b/mysql-test/columnstore/autopilot/r/mcs6744_json_JSON_UNQUOTE.result
@@ -17,11 +17,15 @@ SELECT JSON_UNQUOTE(@json2);
 JSON_UNQUOTE(@json2)
 Sing	ing
 SELECT cVarchar, JSON_UNQUOTE(cVarchar), cText, JSON_UNQUOTE(cText) from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_unquote' isn't supported.
+cVarchar	JSON_UNQUOTE(cVarchar)	cText	JSON_UNQUOTE(cText)
+"Monty"	Monty	"Monty"	Monty
+Sing	ing	Sing	ing	Sing	ing	Sing	ing
 SET @@sql_mode = 'NO_BACKSLASH_ESCAPES';
 SELECT JSON_UNQUOTE(@json2);
 JSON_UNQUOTE(@json2)
 Sing	ing
 SELECT cVarchar, JSON_UNQUOTE(cVarchar), cText, JSON_UNQUOTE(cText) from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_unquote' isn't supported.
+cVarchar	JSON_UNQUOTE(cVarchar)	cText	JSON_UNQUOTE(cText)
+"Monty"	Monty	"Monty"	Monty
+Sing	ing	Sing	ing	Sing	ing	Sing	ing
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/r/mcs6745_json_JSON_VALID_KnownIssue.result b/mysql-test/columnstore/autopilot/r/mcs6745_json_JSON_VALID.result
similarity index 74%
rename from mysql-test/columnstore/autopilot/r/mcs6745_json_JSON_VALID_KnownIssue.result
rename to mysql-test/columnstore/autopilot/r/mcs6745_json_JSON_VALID.result
index d891cf7fc..f0817e525 100644
--- a/mysql-test/columnstore/autopilot/r/mcs6745_json_JSON_VALID_KnownIssue.result
+++ b/mysql-test/columnstore/autopilot/r/mcs6745_json_JSON_VALID.result
@@ -21,7 +21,9 @@ SELECT * FROM jsontest;
 cInt	cVarchar	cText
 1	{"id": 1, "name": "Monty"}	{"id": 1, "name": "Monty"}
 SELECT cVarchar, JSON_VALID(cVarchar), cText, JSON_VALID(cText) from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_valid' isn't supported.
+cVarchar	JSON_VALID(cVarchar)	cText	JSON_VALID(cText)
+{"id": 1, "name": "Monty"}	1	{"id": 1, "name": "Monty"}	1
 SELECT cVarchar, JSON_VALID(CONCAT(cVarchar,'HELLO WORLD')), cText, JSON_VALID(CONCAT(cText,'HELLO WORLD')) from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_valid' isn't supported.
+cVarchar	JSON_VALID(CONCAT(cVarchar,'HELLO WORLD'))	cText	JSON_VALID(CONCAT(cText,'HELLO WORLD'))
+{"id": 1, "name": "Monty"}	0	{"id": 1, "name": "Monty"}	0
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/r/mcs6746_json_JSON_VALUE_KnownIssue.result b/mysql-test/columnstore/autopilot/r/mcs6746_json_JSON_VALUE.result
similarity index 79%
rename from mysql-test/columnstore/autopilot/r/mcs6746_json_JSON_VALUE_KnownIssue.result
rename to mysql-test/columnstore/autopilot/r/mcs6746_json_JSON_VALUE.result
index e02c72715..1438a26aa 100644
--- a/mysql-test/columnstore/autopilot/r/mcs6746_json_JSON_VALUE_KnownIssue.result
+++ b/mysql-test/columnstore/autopilot/r/mcs6746_json_JSON_VALUE.result
@@ -21,5 +21,7 @@ cInt	cVarchar	cText
 1	{"key1":123}	{"key1":123}
 1	{"key1": [1,2,3], "key1":123}	{"key1": [1,2,3], "key1":123}
 SELECT cVarchar, JSON_VALUE(cVarchar, '$.key1'), cText, JSON_VALUE(cText, '$.key1') from jsontest;
-ERROR 42000: The storage engine for the table doesn't support MCS-1001: Function 'json_value' isn't supported.
+cVarchar	JSON_VALUE(cVarchar, '$.key1')	cText	JSON_VALUE(cText, '$.key1')
+{"key1":123}	123	{"key1":123}	123
+{"key1": [1,2,3], "key1":123}	123	{"key1": [1,2,3], "key1":123}	123
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/t/mcs6722_json_JSON_ARRAY_APPEND_KnownIssue.test b/mysql-test/columnstore/autopilot/t/mcs6722_json_JSON_ARRAY_APPEND.test
similarity index 95%
rename from mysql-test/columnstore/autopilot/t/mcs6722_json_JSON_ARRAY_APPEND_KnownIssue.test
rename to mysql-test/columnstore/autopilot/t/mcs6722_json_JSON_ARRAY_APPEND.test
index af2384d8b..5c15b1cdf 100644
--- a/mysql-test/columnstore/autopilot/t/mcs6722_json_JSON_ARRAY_APPEND_KnownIssue.test
+++ b/mysql-test/columnstore/autopilot/t/mcs6722_json_JSON_ARRAY_APPEND.test
@@ -19,13 +19,9 @@ SELECT JSON_ARRAY_APPEND(@json, '$[1]', 6, '$[2]', 7);
 SELECT JSON_ARRAY_APPEND(@json, '$', 5);
 #
 SELECT * FROM jsontest;
---error 1178
 SELECT cVarchar, JSON_ARRAY_APPEND(cVarchar, '$[0]', 5), cText, JSON_ARRAY_APPEND(cText, '$[0]', 5) from jsontest;
---error	1178
 SELECT cVarchar, JSON_ARRAY_APPEND(cVarchar, '$[1]', 6), cText, JSON_ARRAY_APPEND(cText, '$[1]', 6) from jsontest;
---error	1178
 SELECT cVarchar, JSON_ARRAY_APPEND(cVarchar, '$[1]', 6, '$[2]', 7), cText, JSON_ARRAY_APPEND(cText, '$[1]', 6, '$[2]', 7) from jsontest;
---error	1178
 SELECT cVarchar, JSON_ARRAY_APPEND(cVarchar, '$', 5), cText, JSON_ARRAY_APPEND(cText, '$', 5) from jsontest;
 #
 TRUNCATE TABLE jsontest;
@@ -35,7 +31,6 @@ INSERT INTO jsontest VALUES (1, @json, @json);
 #
 SELECT JSON_ARRAY_APPEND(@json, '$.B', 5);
 SELECT * FROM jsontest;
---error	1178
 SELECT cVarchar, JSON_ARRAY_APPEND(cVarchar, '$.B', 5), cText, JSON_ARRAY_APPEND(cText, '$.B', 5) from jsontest;
 #
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/t/mcs6723_json_JSON_ARRAY_INSERT_KnownIssue.test b/mysql-test/columnstore/autopilot/t/mcs6723_json_JSON_ARRAY_INSERT.test
similarity index 96%
rename from mysql-test/columnstore/autopilot/t/mcs6723_json_JSON_ARRAY_INSERT_KnownIssue.test
rename to mysql-test/columnstore/autopilot/t/mcs6723_json_JSON_ARRAY_INSERT.test
index e0506ceb6..506bca39a 100644
--- a/mysql-test/columnstore/autopilot/t/mcs6723_json_JSON_ARRAY_INSERT_KnownIssue.test
+++ b/mysql-test/columnstore/autopilot/t/mcs6723_json_JSON_ARRAY_INSERT.test
@@ -18,11 +18,8 @@ SELECT JSON_ARRAY_INSERT(@json, '$[1]', 6);
 SELECT JSON_ARRAY_INSERT(@json, '$[1]', 6, '$[2]', 7);
 #
 SELECT * FROM jsontest;
---error 1178
 SELECT cVarchar, JSON_ARRAY_INSERT(cVarchar, '$[0]', 5), cText, JSON_ARRAY_INSERT(cText, '$[0]', 5) from jsontest;
---error 1178
 SELECT cVarchar, JSON_ARRAY_INSERT(cVarchar, '$[1]', 6), cText, JSON_ARRAY_INSERT(cText, '$[1]', 6) from jsontest;
---error 1178
 SELECT cVarchar, JSON_ARRAY_INSERT(cVarchar, '$[1]', 6, '$[2]', 7), cText, JSON_ARRAY_INSERT(cText, '$[1]', 6, '$[2]', 7) from jsontest;
 #
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/t/mcs6724_json_JSON_COMPACT_KnownIssue.test b/mysql-test/columnstore/autopilot/t/mcs6724_json_JSON_COMPACT.test
similarity index 97%
rename from mysql-test/columnstore/autopilot/t/mcs6724_json_JSON_COMPACT_KnownIssue.test
rename to mysql-test/columnstore/autopilot/t/mcs6724_json_JSON_COMPACT.test
index f6f7bd95e..e5abc194e 100644
--- a/mysql-test/columnstore/autopilot/t/mcs6724_json_JSON_COMPACT_KnownIssue.test
+++ b/mysql-test/columnstore/autopilot/t/mcs6724_json_JSON_COMPACT.test
@@ -16,7 +16,6 @@ INSERT INTO jsontest VALUES (1, @json, @json);
 SELECT @json, JSON_COMPACT(@json);
 #
 SELECT * FROM jsontest;
---error 1178
 SELECT cVarchar, JSON_COMPACT(cVarchar), cText, JSON_COMPACT(cText) from jsontest;
 #
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/t/mcs6725_json_JSON_CONTAINS_KnownIssue.test b/mysql-test/columnstore/autopilot/t/mcs6725_json_JSON_CONTAINS.test
similarity index 95%
rename from mysql-test/columnstore/autopilot/t/mcs6725_json_JSON_CONTAINS_KnownIssue.test
rename to mysql-test/columnstore/autopilot/t/mcs6725_json_JSON_CONTAINS.test
index c3d497bee..ac570fea8 100644
--- a/mysql-test/columnstore/autopilot/t/mcs6725_json_JSON_CONTAINS_KnownIssue.test
+++ b/mysql-test/columnstore/autopilot/t/mcs6725_json_JSON_CONTAINS.test
@@ -19,13 +19,9 @@ SELECT JSON_CONTAINS(@json, '{"C": 1}', '$.A');
 SELECT JSON_CONTAINS(@json, '{"C": 1}', '$.B');
 #
 SELECT * FROM jsontest;
---error 1178
 SELECT cVarchar, JSON_CONTAINS(cVarchar, '2', '$.A'), cText, JSON_CONTAINS(cText, '2', '$.A') from jsontest;
---error 1178
 SELECT cVarchar, JSON_CONTAINS(cVarchar, '2', '$.D'), cText, JSON_CONTAINS(cText, '2', '$.D') from jsontest;
---error 1178
 SELECT cVarchar, JSON_CONTAINS(cVarchar, '{"C": 1}', '$.A'), cText, JSON_CONTAINS(cText, '{"C": 1}', '$.A') from jsontest;
---error 1178
 SELECT cVarchar, JSON_CONTAINS(cVarchar, '{"C": 1}', '$.B'), cText, JSON_CONTAINS(cText, '{"C": 1}', '$.B') from jsontest;
 #
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/t/mcs6726_json_JSON_CONTAINS_PATH_KnownIssue.test b/mysql-test/columnstore/autopilot/t/mcs6726_json_JSON_CONTAINS_PATH.test
similarity index 97%
rename from mysql-test/columnstore/autopilot/t/mcs6726_json_JSON_CONTAINS_PATH_KnownIssue.test
rename to mysql-test/columnstore/autopilot/t/mcs6726_json_JSON_CONTAINS_PATH.test
index 835bd2f1e..94fcb6b36 100644
--- a/mysql-test/columnstore/autopilot/t/mcs6726_json_JSON_CONTAINS_PATH_KnownIssue.test
+++ b/mysql-test/columnstore/autopilot/t/mcs6726_json_JSON_CONTAINS_PATH.test
@@ -17,9 +17,7 @@ SELECT JSON_CONTAINS_PATH(@json, 'one', '$.A', '$.D');
 SELECT JSON_CONTAINS_PATH(@json, 'all', '$.A', '$.D');
 #
 SELECT * FROM jsontest;
---error 1178
 SELECT cVarchar, JSON_CONTAINS_PATH(cVarchar, 'one', '$.A', '$.D'), cText, JSON_CONTAINS_PATH(cText, 'one', '$.A', '$.D') from jsontest;
---error 1178
 SELECT cVarchar, JSON_CONTAINS_PATH(cVarchar, 'all', '$.A', '$.D'), cText, JSON_CONTAINS_PATH(cText, 'all', '$.A', '$.D') from jsontest;
 #
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/t/mcs6727_json_JSON_DEPTH_KnownIssue.test b/mysql-test/columnstore/autopilot/t/mcs6727_json_JSON_DEPTH.test
similarity index 98%
rename from mysql-test/columnstore/autopilot/t/mcs6727_json_JSON_DEPTH_KnownIssue.test
rename to mysql-test/columnstore/autopilot/t/mcs6727_json_JSON_DEPTH.test
index 191a8a3ae..77b2c0850 100644
--- a/mysql-test/columnstore/autopilot/t/mcs6727_json_JSON_DEPTH_KnownIssue.test
+++ b/mysql-test/columnstore/autopilot/t/mcs6727_json_JSON_DEPTH.test
@@ -18,7 +18,6 @@ SELECT JSON_DEPTH('[1, 2, 3]'), JSON_DEPTH('[[], {}, []]');
 SELECT JSON_DEPTH('[1, 2, [3, 4, 5, 6], 7]');
 #
 SELECT * FROM jsontest;
---error 1178
 SELECT cVarchar, JSON_DEPTH(cVarchar), cText, JSON_DEPTH(cText) from jsontest;
 #
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/t/mcs6729_json_JSON_EXISTS_KnownIssue.test b/mysql-test/columnstore/autopilot/t/mcs6729_json_JSON_EXISTS..test
similarity index 95%
rename from mysql-test/columnstore/autopilot/t/mcs6729_json_JSON_EXISTS_KnownIssue.test
rename to mysql-test/columnstore/autopilot/t/mcs6729_json_JSON_EXISTS..test
index 0a8e43ebb..318dcc067 100644
--- a/mysql-test/columnstore/autopilot/t/mcs6729_json_JSON_EXISTS_KnownIssue.test
+++ b/mysql-test/columnstore/autopilot/t/mcs6729_json_JSON_EXISTS..test
@@ -19,13 +19,9 @@ SELECT JSON_EXISTS(@json, "$.key2[1]");
 SELECT JSON_EXISTS(@json, "$.key2[10]");
 #
 SELECT * FROM jsontest;
---error 1178
 SELECT cVarchar, JSON_EXISTS(cVarchar, "$.key2"), cText, JSON_EXISTS(cText, "$.key2") from jsontest;
---error	1178
 SELECT cVarchar, JSON_EXISTS(cVarchar, "$.key3"), cText, JSON_EXISTS(cText, "$.key3") from jsontest;
---error	1178
 SELECT cVarchar, JSON_EXISTS(cVarchar, "$.key2[1]"), cText, JSON_EXISTS(cText, "$.key2[1]") from jsontest;
---error	1178
 SELECT cVarchar, JSON_EXISTS(cVarchar, "$.key2[10]"), cText, JSON_EXISTS(cText, "$.key2[10]") from jsontest;
 #
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/t/mcs6730_json_JSON_EXTRACT_KnownIssue.test b/mysql-test/columnstore/autopilot/t/mcs6730_json_JSON_EXTRACT.test
similarity index 95%
rename from mysql-test/columnstore/autopilot/t/mcs6730_json_JSON_EXTRACT_KnownIssue.test
rename to mysql-test/columnstore/autopilot/t/mcs6730_json_JSON_EXTRACT.test
index 8365ddf4f..30585b9d3 100644
--- a/mysql-test/columnstore/autopilot/t/mcs6730_json_JSON_EXTRACT_KnownIssue.test
+++ b/mysql-test/columnstore/autopilot/t/mcs6730_json_JSON_EXTRACT.test
@@ -18,11 +18,8 @@ SELECT JSON_EXTRACT(@json, '$[2]');
 SELECT JSON_EXTRACT(@json, '$[2][1]');
 #
 SELECT * FROM jsontest;
---error 1178
 SELECT cVarchar, JSON_EXTRACT(cVarchar, '$[1]'), cText, JSON_EXTRACT(cText, '$[1]') from jsontest;
---error 1178
 SELECT cVarchar, JSON_EXTRACT(cVarchar, '$[2]'), cText, JSON_EXTRACT(cText, '$[2]') from jsontest;
---error 1178
 SELECT cVarchar, JSON_EXTRACT(cVarchar, '$[2][1]'), cText, JSON_EXTRACT(cText, '$[2][1]') from jsontest;
 #
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/t/mcs6731_json_JSON_INSERT_KnownIssue.test b/mysql-test/columnstore/autopilot/t/mcs6731_json_JSON_INSERT.test
similarity index 97%
rename from mysql-test/columnstore/autopilot/t/mcs6731_json_JSON_INSERT_KnownIssue.test
rename to mysql-test/columnstore/autopilot/t/mcs6731_json_JSON_INSERT.test
index 65775df79..2169b1736 100644
--- a/mysql-test/columnstore/autopilot/t/mcs6731_json_JSON_INSERT_KnownIssue.test
+++ b/mysql-test/columnstore/autopilot/t/mcs6731_json_JSON_INSERT.test
@@ -16,7 +16,6 @@ INSERT INTO jsontest VALUES (1, @json, @json);
 SELECT JSON_INSERT(@json, '$.C', '[3, 4]');
 #
 SELECT * FROM jsontest;
---error 1178
 SELECT cVarchar, JSON_INSERT(cVarchar, '$.C', '[3, 4]'), cText, JSON_INSERT(cText, '$.C', '[3, 4]') from jsontest;
 #
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/t/mcs6732_json_JSON_KEYS_KnownIssue.test b/mysql-test/columnstore/autopilot/t/mcs6732_json_JSON_KEYS.test
similarity index 97%
rename from mysql-test/columnstore/autopilot/t/mcs6732_json_JSON_KEYS_KnownIssue.test
rename to mysql-test/columnstore/autopilot/t/mcs6732_json_JSON_KEYS.test
index 6a6dc5b2a..103982e62 100644
--- a/mysql-test/columnstore/autopilot/t/mcs6732_json_JSON_KEYS_KnownIssue.test
+++ b/mysql-test/columnstore/autopilot/t/mcs6732_json_JSON_KEYS.test
@@ -20,9 +20,7 @@ SELECT JSON_KEYS('{"A": 1, "B": {"C": 2}}');
 SELECT JSON_KEYS('{"A": 1, "B": 2, "C": {"D": 3}}', '$.C');
 #
 SELECT * FROM jsontest;
---error 1178
 SELECT cVarchar, JSON_KEYS(cVarchar), cText, JSON_KEYS(cText) from jsontest;
---error 1178
 SELECT cVarchar, JSON_KEYS(cVarchar, '$.C'), cText, JSON_KEYS(cText, '$.C') from jsontest;
 #
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/t/mcs6733_json_JSON_LENGTH_KnownIssue.test b/mysql-test/columnstore/autopilot/t/mcs6733_json_JSON_LENGTH.test
similarity index 97%
rename from mysql-test/columnstore/autopilot/t/mcs6733_json_JSON_LENGTH_KnownIssue.test
rename to mysql-test/columnstore/autopilot/t/mcs6733_json_JSON_LENGTH.test
index 6c2f9e541..28fb69fb3 100644
--- a/mysql-test/columnstore/autopilot/t/mcs6733_json_JSON_LENGTH_KnownIssue.test
+++ b/mysql-test/columnstore/autopilot/t/mcs6733_json_JSON_LENGTH.test
@@ -21,9 +21,7 @@ SELECT JSON_LENGTH(@json2);
 SELECT JSON_LENGTH(@json2, '$.b');
 #
 SELECT * FROM jsontest;
---error 1178
 SELECT cVarchar, JSON_LENGTH(cVarchar), cText, JSON_LENGTH(cText) from jsontest;
---error 1178
 SELECT cVarchar, JSON_LENGTH(cVarchar, '$.b'), cText, JSON_LENGTH(cText, '$.b') from jsontest;
 #
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/t/mcs6734_json_JSON_LOOSE_KnownIssue.test b/mysql-test/columnstore/autopilot/t/mcs6734_json_JSON_LOOSE.test
similarity index 97%
rename from mysql-test/columnstore/autopilot/t/mcs6734_json_JSON_LOOSE_KnownIssue.test
rename to mysql-test/columnstore/autopilot/t/mcs6734_json_JSON_LOOSE.test
index 6d6ab1a82..20c740d0d 100644
--- a/mysql-test/columnstore/autopilot/t/mcs6734_json_JSON_LOOSE_KnownIssue.test
+++ b/mysql-test/columnstore/autopilot/t/mcs6734_json_JSON_LOOSE.test
@@ -16,7 +16,6 @@ INSERT INTO jsontest VALUES (1, @json, @json);
 SELECT JSON_LOOSE(@json);
 #
 SELECT * FROM jsontest;
---error 1178
 SELECT cVarchar, JSON_LOOSE(cVarchar), cText, JSON_LOOSE(cText) from jsontest;
 #
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/t/mcs6735_json_JSON_MERGE_KnownIssue.test b/mysql-test/columnstore/autopilot/t/mcs6735_json_JSON_MERGE.test
similarity index 96%
rename from mysql-test/columnstore/autopilot/t/mcs6735_json_JSON_MERGE_KnownIssue.test
rename to mysql-test/columnstore/autopilot/t/mcs6735_json_JSON_MERGE.test
index 22b8e8a63..60ed17c2c 100644
--- a/mysql-test/columnstore/autopilot/t/mcs6735_json_JSON_MERGE_KnownIssue.test
+++ b/mysql-test/columnstore/autopilot/t/mcs6735_json_JSON_MERGE.test
@@ -19,9 +19,7 @@ INSERT INTO jsontest VALUES (1, @json2, @json2);
 SELECT JSON_MERGE(@json1,@json2);
 #
 SELECT * FROM jsontest;
---error 1178
 SELECT cVarchar, JSON_MERGE(cVarchar, @json2), cText, JSON_MERGE(cText, @json2) from jsontest;
---error 1178
 SELECT cVarchar, JSON_MERGE(cVarchar, cText), cText, JSON_MERGE(cText, cVarchar) from jsontest;
 TRUNCATE TABLE jsontest;
 #
diff --git a/mysql-test/columnstore/autopilot/t/mcs6737_json_JSON_QUERY_KnownIssue.test b/mysql-test/columnstore/autopilot/t/mcs6737_json_JSON_QUERY.test
similarity index 98%
rename from mysql-test/columnstore/autopilot/t/mcs6737_json_JSON_QUERY_KnownIssue.test
rename to mysql-test/columnstore/autopilot/t/mcs6737_json_JSON_QUERY.test
index fcfab2859..2a520dab7 100644
--- a/mysql-test/columnstore/autopilot/t/mcs6737_json_JSON_QUERY_KnownIssue.test
+++ b/mysql-test/columnstore/autopilot/t/mcs6737_json_JSON_QUERY.test
@@ -20,7 +20,6 @@ SELECT JSON_QUERY(@json1, '$.key1');
 SELECT JSON_QUERY(@json2, '$.key1');
 #
 SELECT * FROM jsontest;
---error 1178
 SELECT cVarchar, JSON_QUERY(cVarchar, '$.key1'), cText, JSON_QUERY(cText, '$.key1') from jsontest;
 TRUNCATE TABLE jsontest;
 #
diff --git a/mysql-test/columnstore/autopilot/t/mcs6739_json_JSON_REMOVE_KnownIssue.test b/mysql-test/columnstore/autopilot/t/mcs6739_json_JSON_REMOVE.test
similarity index 96%
rename from mysql-test/columnstore/autopilot/t/mcs6739_json_JSON_REMOVE_KnownIssue.test
rename to mysql-test/columnstore/autopilot/t/mcs6739_json_JSON_REMOVE.test
index 335f3c803..94c1a7506 100644
--- a/mysql-test/columnstore/autopilot/t/mcs6739_json_JSON_REMOVE_KnownIssue.test
+++ b/mysql-test/columnstore/autopilot/t/mcs6739_json_JSON_REMOVE.test
@@ -19,9 +19,7 @@ SELECT JSON_REMOVE(@json1, '$.C');
 SELECT JSON_REMOVE(@json2, '$[1]');
 #
 SELECT * FROM jsontest;
---error 1178
 SELECT cVarchar, JSON_REMOVE(cVarchar, '$.C'), cText, JSON_REMOVE(cText, '$.C') from jsontest;
---error 1178
 SELECT cVarchar, JSON_REMOVE(cVarchar, '$[1]'), cText, JSON_REMOVE(cText, '$[1]') from jsontest;
 #
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/t/mcs6740_json_JSON_REPLACE.test b/mysql-test/columnstore/autopilot/t/mcs6740_json_JSON_REPLACE.test
index 0a3e18b62..8d8c8060d 100644
--- a/mysql-test/columnstore/autopilot/t/mcs6740_json_JSON_REPLACE.test
+++ b/mysql-test/columnstore/autopilot/t/mcs6740_json_JSON_REPLACE.test
@@ -16,7 +16,6 @@ INSERT INTO jsontest VALUES (1, @json, @json);
 SELECT JSON_REPLACE(@json, '$.B[1]', 4);
 #
 SELECT * FROM jsontest;
---error 1178
 SELECT cVarchar, JSON_REPLACE(cVarchar, '$.B[1]', 4), cText, JSON_REPLACE(cText, '$.B[1]', 4) from jsontest;
 #
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/t/mcs6741_json_JSON_SEARCH_KnownIssue.test b/mysql-test/columnstore/autopilot/t/mcs6741_json_JSON_SEARCH.test
similarity index 98%
rename from mysql-test/columnstore/autopilot/t/mcs6741_json_JSON_SEARCH_KnownIssue.test
rename to mysql-test/columnstore/autopilot/t/mcs6741_json_JSON_SEARCH.test
index a2564998e..ee626ce55 100644
--- a/mysql-test/columnstore/autopilot/t/mcs6741_json_JSON_SEARCH_KnownIssue.test
+++ b/mysql-test/columnstore/autopilot/t/mcs6741_json_JSON_SEARCH.test
@@ -16,7 +16,6 @@ INSERT INTO jsontest VALUES (1, @json, @json);
 SELECT JSON_SEARCH(@json, 'one', 'AB');
 #
 SELECT * FROM jsontest;
---error 1178
 SELECT cVarchar, JSON_SEARCH(cVarchar, 'one', 'AB'), cText, JSON_SEARCH(cText, 'one', 'AB') from jsontest;
 #
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/t/mcs6742_json_JSON_SET_KnownIssue.test b/mysql-test/columnstore/autopilot/t/mcs6742_json_JSON_SET.test
similarity index 98%
rename from mysql-test/columnstore/autopilot/t/mcs6742_json_JSON_SET_KnownIssue.test
rename to mysql-test/columnstore/autopilot/t/mcs6742_json_JSON_SET.test
index 3ff5dd9b1..924553db9 100644
--- a/mysql-test/columnstore/autopilot/t/mcs6742_json_JSON_SET_KnownIssue.test
+++ b/mysql-test/columnstore/autopilot/t/mcs6742_json_JSON_SET.test
@@ -16,7 +16,6 @@ INSERT INTO jsontest VALUES (1, @json, @json);
 SELECT JSON_SET(@json, '$.a', 10, '$.c', '[true, false]');
 #
 SELECT * FROM jsontest;
---error 1178
 SELECT cVarchar, JSON_SET(cVarchar,'$.a', 10, '$.c', '[true, false]'), cText, JSON_SET(cText,'$.a', 10, '$.c', '[true, false]') from jsontest;
 TRUNCATE TABLE jsontest;
 #
diff --git a/mysql-test/columnstore/autopilot/t/mcs6743_json_JSON_TYPE_KnownIssue.test b/mysql-test/columnstore/autopilot/t/mcs6743_json_JSON_TYPE_KnownIssue.test
index 87dc61698..5c108f38c 100644
--- a/mysql-test/columnstore/autopilot/t/mcs6743_json_JSON_TYPE_KnownIssue.test
+++ b/mysql-test/columnstore/autopilot/t/mcs6743_json_JSON_TYPE_KnownIssue.test
@@ -16,7 +16,6 @@ INSERT INTO jsontest VALUES (1, @json, @json);
 SELECT JSON_TYPE(@json);
 #
 SELECT * FROM jsontest;
---error 1178
 SELECT cVarchar, JSON_TYPE(cVarchar), cText, JSON_TYPE(cText) from jsontest;
 #
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/t/mcs6744_json_JSON_UNQUOTE_KnownIssue.test b/mysql-test/columnstore/autopilot/t/mcs6744_json_JSON_UNQUOTE.test
similarity index 96%
rename from mysql-test/columnstore/autopilot/t/mcs6744_json_JSON_UNQUOTE_KnownIssue.test
rename to mysql-test/columnstore/autopilot/t/mcs6744_json_JSON_UNQUOTE.test
index 36d298ced..b57e23ef9 100644
--- a/mysql-test/columnstore/autopilot/t/mcs6744_json_JSON_UNQUOTE_KnownIssue.test
+++ b/mysql-test/columnstore/autopilot/t/mcs6744_json_JSON_UNQUOTE.test
@@ -20,12 +20,10 @@ INSERT INTO jsontest VALUES (1, @json2, @json2);
 #
 SELECT JSON_UNQUOTE(@json1);
 SELECT JSON_UNQUOTE(@json2);
---error 1178
 SELECT cVarchar, JSON_UNQUOTE(cVarchar), cText, JSON_UNQUOTE(cText) from jsontest;
 #
 SET @@sql_mode = 'NO_BACKSLASH_ESCAPES';
 SELECT JSON_UNQUOTE(@json2);
---error 1178
 SELECT cVarchar, JSON_UNQUOTE(cVarchar), cText, JSON_UNQUOTE(cText) from jsontest;
 TRUNCATE TABLE jsontest;
 #
diff --git a/mysql-test/columnstore/autopilot/t/mcs6745_json_JSON_VALID_KnownIssue.test b/mysql-test/columnstore/autopilot/t/mcs6745_json_JSON_VALID.test
similarity index 97%
rename from mysql-test/columnstore/autopilot/t/mcs6745_json_JSON_VALID_KnownIssue.test
rename to mysql-test/columnstore/autopilot/t/mcs6745_json_JSON_VALID.test
index 5fb688125..c71418649 100644
--- a/mysql-test/columnstore/autopilot/t/mcs6745_json_JSON_VALID_KnownIssue.test
+++ b/mysql-test/columnstore/autopilot/t/mcs6745_json_JSON_VALID.test
@@ -23,9 +23,7 @@ SELECT @tmpstr2;
 INSERT INTO jsontest VALUES (1, @tmpstr1, @tmpstr1);
 #
 SELECT * FROM jsontest;
---error 1178
 SELECT cVarchar, JSON_VALID(cVarchar), cText, JSON_VALID(cText) from jsontest;
---error 1178
 SELECT cVarchar, JSON_VALID(CONCAT(cVarchar,'HELLO WORLD')), cText, JSON_VALID(CONCAT(cText,'HELLO WORLD')) from jsontest;
 #
 TRUNCATE TABLE jsontest;
diff --git a/mysql-test/columnstore/autopilot/t/mcs6746_json_JSON_VALUE_KnownIssue.test b/mysql-test/columnstore/autopilot/t/mcs6746_json_JSON_VALUE.test
similarity index 98%
rename from mysql-test/columnstore/autopilot/t/mcs6746_json_JSON_VALUE_KnownIssue.test
rename to mysql-test/columnstore/autopilot/t/mcs6746_json_JSON_VALUE.test
index 07996ad5d..9c021fa1c 100644
--- a/mysql-test/columnstore/autopilot/t/mcs6746_json_JSON_VALUE_KnownIssue.test
+++ b/mysql-test/columnstore/autopilot/t/mcs6746_json_JSON_VALUE.test
@@ -20,7 +20,6 @@ SELECT JSON_VALUE(@json1, '$.key1');
 SELECT JSON_VALUE(@json2, '$.key1');
 #
 SELECT * FROM jsontest;
---error 1178
 SELECT cVarchar, JSON_VALUE(cVarchar, '$.key1'), cText, JSON_VALUE(cText, '$.key1') from jsontest;
 #
 TRUNCATE TABLE jsontest;