From 4ed30b2ac5187bb7e92ff22ff85fad82083cf315 Mon Sep 17 00:00:00 2001
From: Alexander Barkov <bar@mariadb.com>
Date: Mon, 25 Apr 2022 09:25:30 +0400
Subject: [PATCH] MDEV-27690 Crash on `CHARACTER SET csname COLLATE DEFAULT` in
 column definition

Adding a 10.6 specific test from the MDEV
---
 mysql-test/suite/json/r/json_table.result | 10 ++++++++++
 mysql-test/suite/json/t/json_table.test   | 11 +++++++++++
 2 files changed, 21 insertions(+)

diff --git a/mysql-test/suite/json/r/json_table.result b/mysql-test/suite/json/r/json_table.result
index 75a7e884633..4619240ba00 100644
--- a/mysql-test/suite/json/r/json_table.result
+++ b/mysql-test/suite/json/r/json_table.result
@@ -981,5 +981,15 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
   )
 ) AS jt' at line 3
 #
+# MDEV-27690 Crash on `CHARACTER SET csname COLLATE DEFAULT` in column definition
+#
+SELECT * FROM json_table('[{"name":"Jeans"}]', '$[*]'
+  COLUMNS(
+name  VARCHAR(10) CHARACTER SET latin1 COLLATE DEFAULT PATH '$.name'
+  )
+) AS jt;
+name
+Jeans
+#
 # End of 10.6 tests
 #
diff --git a/mysql-test/suite/json/t/json_table.test b/mysql-test/suite/json/t/json_table.test
index 2867c5f89d0..dbb9f43ab17 100644
--- a/mysql-test/suite/json/t/json_table.test
+++ b/mysql-test/suite/json/t/json_table.test
@@ -842,6 +842,17 @@ SELECT * FROM json_table('[{"name":"str"}]', '$[*]'
 ) AS jt;
 
 
+--echo #
+--echo # MDEV-27690 Crash on `CHARACTER SET csname COLLATE DEFAULT` in column definition
+--echo #
+
+SELECT * FROM json_table('[{"name":"Jeans"}]', '$[*]'
+  COLUMNS(
+    name  VARCHAR(10) CHARACTER SET latin1 COLLATE DEFAULT PATH '$.name'
+  )
+) AS jt;
+
+
 --echo #
 --echo # End of 10.6 tests
 --echo #