From 3b58c6b93f2d69588307f1a6b7014fa2da112465 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Fri, 4 Oct 2024 18:40:34 +0200
Subject: [PATCH] MDEV-35079 Migrate MySQL5.7 to MariaDB 10.4, then to MariaDB
 10.11 Failed

correctly detect when partitioning is disabled
---
 mysql-test/main/mysql57nopart.result |  13 +++++++++++++
 mysql-test/main/mysql57nopart.test   |  11 +++++++++++
 mysql-test/std_data/mysql57part.frm  | Bin 0 -> 9318 bytes
 sql/table.cc                         |  13 ++++++-------
 4 files changed, 30 insertions(+), 7 deletions(-)
 create mode 100644 mysql-test/main/mysql57nopart.result
 create mode 100644 mysql-test/main/mysql57nopart.test
 create mode 100644 mysql-test/std_data/mysql57part.frm

diff --git a/mysql-test/main/mysql57nopart.result b/mysql-test/main/mysql57nopart.result
new file mode 100644
index 00000000000..2b902f27947
--- /dev/null
+++ b/mysql-test/main/mysql57nopart.result
@@ -0,0 +1,13 @@
+#
+# MDEV-35079 Migrate MySQL5.7 to MariaDB 10.4, then to MariaDB 10.11 Failed
+#
+select table_name, concat('<',table_comment,'>') from information_schema.tables
+where table_schema='test';
+table_name	concat('<',table_comment,'>')
+mysql57part	<The MariaDB server is running with the --skip-partition option so it cannot execute this statement>
+Warnings:
+Warning	1290	The MariaDB server is running with the --skip-partition option so it cannot execute this statement
+drop table mysql57part;
+Warnings:
+Warning	1932	Table 'test.mysql57part' doesn't exist in engine
+# End of 10.11 tests
diff --git a/mysql-test/main/mysql57nopart.test b/mysql-test/main/mysql57nopart.test
new file mode 100644
index 00000000000..93df68cee5f
--- /dev/null
+++ b/mysql-test/main/mysql57nopart.test
@@ -0,0 +1,11 @@
+source include/have_innodb.inc;
+--echo #
+--echo # MDEV-35079 Migrate MySQL5.7 to MariaDB 10.4, then to MariaDB 10.11 Failed
+--echo #
+let $datadir=`select @@datadir`;
+copy_file std_data/mysql57part.frm $datadir/test/mysql57part.frm;
+select table_name, concat('<',table_comment,'>') from information_schema.tables
+  where table_schema='test';
+drop table mysql57part;
+
+--echo # End of 10.11 tests
diff --git a/mysql-test/std_data/mysql57part.frm b/mysql-test/std_data/mysql57part.frm
new file mode 100644
index 0000000000000000000000000000000000000000..9a2e577997344f8c14dd5f3c1493e6fb7e066d40
GIT binary patch
literal 9318
zcmeHN-A)rh82z@ih3=M8Xf-ByvBVpim;i&KCYrcPgEdeHRK-M7*LIMNWlP$kaJP?O
zqTcubzJae`yy4zQ@EN#p{APAbSD0kHAjY4Wi)Hrkoo{AOPnYeX-wiW61dulXW&sY<
zPm>G>@R9fc8GsbQ>4*UEaF_<T^cmn|k|SAwnHd0^&-Ks>Xa%$aS^=$qRzNGD70?Q3
z1+)TM0j+>m;Ez=xg&*h_aCf7Sz@rgh7H}6o?hgfN1K!+Dfdd3E8vrwy!h(Pxa3p|4
zU?Cjvlav5rl%xQLg9`>s21#IR>y;H}{W0r$J?i;Qy3gE}+u7+I>{8aD4eGt3^`5sw
zL)h(hX)lZ*a0NZI0$KsBfL1^&pi+Q+Q&s#2zYq8|iUXhYN6??>pIU+6rvQI+{AWfQ
zD!$)dyz?6W`DL#;>$OU)vRbw8Jhs=J>QdRBKA>)AI{rXgDw)%R!d)^uH*Y_5mLHTi
z?B(*thF!boRPAXFm+W$NsZuT5x9o6{%Vul|&b%ULUQsiz%9&Ty%mq1fLCw4-XI@h?
zugjU&)yx}m<_#s2%u1PLR?VD~Gw0MyB4-jcQ|=+6_7IVKh^Re8<Q^hw4-vVCh}uI$
z?jfS~5RrR`s69mF9wKTF&C5MBukuiN_0ee~tT>zEHgWQ%Py(1d+uP|@67px;@$c$p
zzy#bhKH(kxY4Ypw*4N-X<iy!cqcD*umh4{~kc5oLHtJpza}g_?^PmILFdF~U0K<^o
z@_etmEus(1T(aA)-)vzL!mBfoi?|(kmp3ybK%^rauwcB^Zn&*@lPp->z2{rres8Zs
zG1D=5;!<z4n-nj{;t@-|=f0#qjDac6wrQ)02FSPQ3%7AlKi>LyMD^VriVBH7OP%)K
zE)*c+b;Cj^;&RmQ)!I(2eIL$2j_%XOUe9a$^)Bu(nJE@Q1WG972!4koWi1}zzQf1U
zF$B`1g#w7A3Bd^jhO-D*7(E3MFp{+_{_T`W4h&&MCWk;V2ACWWNmEo|jbo3Cu^w4#
zk--!`itrwM*-?`a5P4PvU<(UsiNPvkCIXu=AfHFzNemb_%M70J&@AdP!J9tA%MBu+
zkTDE+I|K>-2Fv5JMGJv<2)v1ab2;Y=ypK`B01RK<XmUCsi@n+`=9hkbXqND-?-X{@
oCT!pl5y=UIuz@?mDYphY;ft`Gn?lTlBUs-KY~Tg<lMxvF0Mgbjga7~l

literal 0
HcmV?d00001

diff --git a/sql/table.cc b/sql/table.cc
index 394e43fcda0..68b3d9efc9a 100644
--- a/sql/table.cc
+++ b/sql/table.cc
@@ -1728,9 +1728,9 @@ public:
 */
 
 #ifdef WITH_PARTITION_STORAGE_ENGINE
-static bool change_to_partiton_engine(LEX_CSTRING *name,
-                                      plugin_ref *se_plugin)
+static bool change_to_partiton_engine(plugin_ref *se_plugin)
 {
+  LEX_CSTRING name= { STRING_WITH_LEN("partition") };
   /*
     Use partition handler
     tmp_plugin is locked with a local lock.
@@ -1738,10 +1738,9 @@ static bool change_to_partiton_engine(LEX_CSTRING *name,
     replacing it with a globally locked version of tmp_plugin
   */
   /* Check if the partitioning engine is ready */
-  if (!plugin_is_ready(name, MYSQL_STORAGE_ENGINE_PLUGIN))
+  if (!plugin_is_ready(&name, MYSQL_STORAGE_ENGINE_PLUGIN))
   {
-    my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0),
-             "--skip-partition");
+    my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--skip-partition");
     return 1;
   }
   plugin_unlock(NULL, *se_plugin);
@@ -2039,7 +2038,7 @@ int TABLE_SHARE::init_from_binary_frm_image(THD *thd, bool write,
       else if (str_db_type_length == 9 &&
                !strncmp((char *) next_chunk + 2, "partition", 9))
       {
-        if (change_to_partiton_engine(&se_name, &se_plugin))
+        if (change_to_partiton_engine(&se_plugin))
           goto err;
       }
 #endif
@@ -2078,7 +2077,7 @@ int TABLE_SHARE::init_from_binary_frm_image(THD *thd, bool write,
             share->mysql_version >= 50600 && share->mysql_version <= 50799)
         {
           share->keep_original_mysql_version= 1;
-          if (change_to_partiton_engine(&se_name, &se_plugin))
+          if (change_to_partiton_engine(&se_plugin))
             goto err;
         }
       }