Merge 10.7 into 10.8

4 files changed, 52 insertions, 25 deletions

diff --git a/mysql-test/suite/compat/oracle/r/anonymous_derived.result b/mysql-test/suite/compat/oracle/r/anonymous_derived.result
index 85868794130..6b482d7bdcc 100644
--- a/mysql-test/suite/compat/oracle/r/anonymous_derived.result
+++ b/mysql-test/suite/compat/oracle/r/anonymous_derived.result
@@ -68,7 +68,7 @@ a	b
 3	3
 show create view v1;
 View	Create View	character_set_client	collation_connection
-v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `test`.`t1`.`a` AS `a`,`__3`.`b` AS `b` from (`test`.`t1` join (select max(`test`.`t2`.`a`) AS `b` from `test`.`t2`) `__3`)	latin1	latin1_swedish_ci
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select `t1`.`a` AS `a`,`__3`.`b` AS `b` from (`t1` join (select max(`t2`.`a`) AS `b` from `t2`) `__3`)	latin1	latin1_swedish_ci
 call p1;
 a	b
 2	3
diff --git a/mysql-test/suite/compat/oracle/r/misc.result b/mysql-test/suite/compat/oracle/r/misc.result
index 38f38bd07e6..fed7e26c31b 100644
--- a/mysql-test/suite/compat/oracle/r/misc.result
+++ b/mysql-test/suite/compat/oracle/r/misc.result
@@ -1,5 +1,25 @@
 SET sql_mode=ORACLE;
 #
+# Start of 10.2 tests
+#
+#
+# MDEV-27690 Crash on `CHARACTER SET csname COLLATE DEFAULT` in column definition
+#
+CREATE TABLE t1 (a CHAR(10) CHARACTER SET latin1 COLLATE DEFAULT);
+DROP TABLE t1;
+SELECT CAST('a' AS CHAR(10) CHARACTER SET latin1 COLLATE DEFAULT);
+CAST('a' AS CHAR(10) CHARACTER SET latin1 COLLATE DEFAULT)
+a
+SELECT COLUMN_GET(COLUMN_CREATE(0, 'string'),0 AS CHAR CHARACTER SET latin1 COLLATE DEFAULT) AS c1;
+c1
+string
+#
+# End of 10.2 tests
+#
+#
+# Start of 10.3 tests
+#
+#
 # MDEV-12086 sql_mode=ORACLE: allow SELECT UNIQUE as a synonym for SELECT DISTINCT
 #
 CREATE TABLE t1 (a INT);
@@ -10,3 +30,6 @@ a
 20
 30
 DROP TABLE t1;
+#
+# End of 10.3 tests
+#
diff --git a/mysql-test/suite/compat/oracle/r/table_value_constr.result b/mysql-test/suite/compat/oracle/r/table_value_constr.result
index 108163ed782..365edaa7757 100644
--- a/mysql-test/suite/compat/oracle/r/table_value_constr.result
+++ b/mysql-test/suite/compat/oracle/r/table_value_constr.result
@@ -1302,8 +1302,6 @@ EXPLAIN
 {
   "query_block": {
     "union_result": {
-      "table_name": "<unit1>",
-      "access_type": "ALL",
       "query_specifications": [
         {
           "query_block": {
@@ -1523,8 +1521,6 @@ EXPLAIN
 {
   "query_block": {
     "union_result": {
-      "table_name": "<union1,2>",
-      "access_type": "ALL",
       "query_specifications": [
         {
           "query_block": {
@@ -1587,8 +1583,6 @@ EXPLAIN
 {
   "query_block": {
     "union_result": {
-      "table_name": "<union1,2>",
-      "access_type": "ALL",
       "query_specifications": [
         {
           "query_block": {
@@ -1631,8 +1625,6 @@ EXPLAIN
 {
   "query_block": {
     "union_result": {
-      "table_name": "<union1,2,3>",
-      "access_type": "ALL",
       "query_specifications": [
         {
           "query_block": {
@@ -1675,10 +1667,6 @@ ANALYZE
 {
   "query_block": {
     "union_result": {
-      "table_name": "<unit1>",
-      "access_type": "ALL",
-      "r_loops": 0,
-      "r_rows": null,
       "query_specifications": [
         {
           "query_block": {
@@ -1906,10 +1894,6 @@ ANALYZE
 {
   "query_block": {
     "union_result": {
-      "table_name": "<union1,2>",
-      "access_type": "ALL",
-      "r_loops": 0,
-      "r_rows": null,
       "query_specifications": [
         {
           "query_block": {
@@ -1974,10 +1958,6 @@ ANALYZE
 {
   "query_block": {
     "union_result": {
-      "table_name": "<union1,2>",
-      "access_type": "ALL",
-      "r_loops": 0,
-      "r_rows": null,
       "query_specifications": [
         {
           "query_block": {
@@ -2020,10 +2000,6 @@ ANALYZE
 {
   "query_block": {
     "union_result": {
-      "table_name": "<union1,2,3>",
-      "access_type": "ALL",
-      "r_loops": 0,
-      "r_rows": null,
       "query_specifications": [
         {
           "query_block": {
diff --git a/mysql-test/suite/compat/oracle/t/misc.test b/mysql-test/suite/compat/oracle/t/misc.test
index d939b20f8a0..b3fdfdf3851 100644
--- a/mysql-test/suite/compat/oracle/t/misc.test
+++ b/mysql-test/suite/compat/oracle/t/misc.test
@@ -1,6 +1,29 @@
 SET sql_mode=ORACLE;
 
 --echo #
+--echo # Start of 10.2 tests
+--echo #
+
+--echo #
+--echo # MDEV-27690 Crash on `CHARACTER SET csname COLLATE DEFAULT` in column definition
+--echo #
+
+CREATE TABLE t1 (a CHAR(10) CHARACTER SET latin1 COLLATE DEFAULT);
+DROP TABLE t1;
+SELECT CAST('a' AS CHAR(10) CHARACTER SET latin1 COLLATE DEFAULT);
+SELECT COLUMN_GET(COLUMN_CREATE(0, 'string'),0 AS CHAR CHARACTER SET latin1 COLLATE DEFAULT) AS c1;
+
+--echo #
+--echo # End of 10.2 tests
+--echo #
+
+
+
+--echo #
+--echo # Start of 10.3 tests
+--echo #
+
+--echo #
 --echo # MDEV-12086 sql_mode=ORACLE: allow SELECT UNIQUE as a synonym for SELECT DISTINCT
 --echo #
 
@@ -8,3 +31,8 @@ CREATE TABLE t1 (a INT);
 INSERT INTO t1 VALUES (10),(20),(20),(30),(30),(30);
 SELECT UNIQUE a FROM t1;
 DROP TABLE t1;
+
+
+--echo #
+--echo # End of 10.3 tests
+--echo #