From bd010292557a571089c91e75b77fe773ab4ee2d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= <marko.makela@mariadb.com>
Date: Mon, 11 Dec 2023 15:26:22 +0200
Subject: [PATCH] MDEV-29972 Crash emitting "Unsupported meta-data version
 number" error message

row_import_read_meta_data(): Use ER_NOT_SUPPORTED_YET instead of
ER_IO_READ_ERROR to have a matching error message pattern.
---
 mysql-test/std_data/mysql80/t2.cfg            | Bin 0 -> 637 bytes
 mysql-test/std_data/mysql80/t2.ibd            | Bin 0 -> 114688 bytes
 .../suite/innodb/r/innodb-wl5522-1.result     |  14 +++++++++++-
 .../suite/innodb/t/innodb-wl5522-1.test       |  21 +++++++++++++++++-
 storage/innobase/row/row0import.cc            |  13 +++--------
 5 files changed, 36 insertions(+), 12 deletions(-)
 create mode 100644 mysql-test/std_data/mysql80/t2.cfg
 create mode 100644 mysql-test/std_data/mysql80/t2.ibd

diff --git a/mysql-test/std_data/mysql80/t2.cfg b/mysql-test/std_data/mysql80/t2.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..81f92978393cb4d9af715bc26b68af49349169dd
GIT binary patch
literal 637
zcmb7>-Acni5QR6X(I8dv5qts-NWr_Rxd}vD(ujJs1d~8PYccDEFXOA$`Su4Qc;kWD
zojr5rFHuSzD5Z{OS=0B~tm&^VF6FIK(+%d_WcVI)?lZAH96>ZPODHubo=oJ}7Yjmy
zh(WwoyPb0#m&yY%2qOH${6<%cM_uHS0Ei<PC&VZ{NT{nPmmnP42muK!2^cM4YCDvr
zUe=Wx%9e{=JKGRKQX<l(V!W+LZb}~CmJh317x%ed<%JLy>`nK?d~G{NxhWtg>o!oV
z4K<qFhp0{D*N8qAs-L{PzimIdVdz@@+HHK)esoe#KR1615F$w0#xy*@w-}32oMl53
Yga9sGR>j?Q^=t__f<}I+$3GYP0oII3?f?J)

literal 0
HcmV?d00001

diff --git a/mysql-test/std_data/mysql80/t2.ibd b/mysql-test/std_data/mysql80/t2.ibd
new file mode 100644
index 0000000000000000000000000000000000000000..be2b46a7af1d52f803c88f381759f35557d88f48
GIT binary patch
literal 114688
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

literal 0
HcmV?d00001

diff --git a/mysql-test/suite/innodb/r/innodb-wl5522-1.result b/mysql-test/suite/innodb/r/innodb-wl5522-1.result
index 204d6bc8b78..42c0631dd29 100644
--- a/mysql-test/suite/innodb/r/innodb-wl5522-1.result
+++ b/mysql-test/suite/innodb/r/innodb-wl5522-1.result
@@ -808,6 +808,18 @@ call mtr.add_suppression("InnoDB: unsupported MySQL tablespace");
 ALTER TABLE t1 IMPORT TABLESPACE;
 ERROR 42000: Table 't1' uses an extension that doesn't exist in this MariaDB version
 DROP TABLE t1;
-#
 # End of 10.3 tests
 #
+# MDEV-29972 crash after "Unsupported meta-data version number"
+#
+call mtr.add_suppression("Index for table 't2' is corrupt");
+CREATE TABLE t2 (i INT PRIMARY KEY) ENGINE=InnoDB;
+ALTER TABLE t2 DISCARD TABLESPACE;
+ALTER TABLE t2 IMPORT TABLESPACE;
+ERROR 42000: This version of MariaDB doesn't yet support 'meta-data version'
+ALTER TABLE t2 IMPORT TABLESPACE;
+ERROR HY000: Index for table 't2' is corrupt; try to repair it
+SELECT * FROM t2;
+ERROR HY000: Tablespace has been discarded for table `t2`
+DROP TABLE t2;
+# End of 10.4 tests
diff --git a/mysql-test/suite/innodb/t/innodb-wl5522-1.test b/mysql-test/suite/innodb/t/innodb-wl5522-1.test
index dbd58835ec6..9e5d606b894 100644
--- a/mysql-test/suite/innodb/t/innodb-wl5522-1.test
+++ b/mysql-test/suite/innodb/t/innodb-wl5522-1.test
@@ -960,6 +960,25 @@ ALTER TABLE t1 IMPORT TABLESPACE;
 DROP TABLE t1;
 --remove_file $MYSQLTEST_VARDIR/tmp/t1.ibd
 
---echo #
 --echo # End of 10.3 tests
+
 --echo #
+--echo # MDEV-29972 crash after "Unsupported meta-data version number"
+--echo #
+
+call mtr.add_suppression("Index for table 't2' is corrupt");
+
+CREATE TABLE t2 (i INT PRIMARY KEY) ENGINE=InnoDB;
+ALTER TABLE t2 DISCARD TABLESPACE;
+--copy_file std_data/mysql80/t2.cfg $MYSQLD_DATADIR/test/t2.cfg
+--copy_file std_data/mysql80/t2.ibd $MYSQLD_DATADIR/test/t2.ibd
+--error ER_NOT_SUPPORTED_YET
+ALTER TABLE t2 IMPORT TABLESPACE;
+--remove_file $MYSQLD_DATADIR/test/t2.cfg
+--error ER_NOT_KEYFILE
+ALTER TABLE t2 IMPORT TABLESPACE;
+--error ER_TABLESPACE_DISCARDED
+SELECT * FROM t2;
+DROP TABLE t2;
+
+--echo # End of 10.4 tests
diff --git a/storage/innobase/row/row0import.cc b/storage/innobase/row/row0import.cc
index c4534938ad5..608a739001c 100644
--- a/storage/innobase/row/row0import.cc
+++ b/storage/innobase/row/row0import.cc
@@ -120,7 +120,6 @@ struct row_import {
 	row_import() UNIV_NOTHROW
 		:
 		m_table(NULL),
-		m_version(0),
 		m_hostname(NULL),
 		m_table_name(NULL),
 		m_autoinc(0),
@@ -199,8 +198,6 @@ struct row_import {
 
 	dict_table_t*	m_table;		/*!< Table instance */
 
-	ulint		m_version;		/*!< Version of config file */
-
 	byte*		m_hostname;		/*!< Hostname where the
 						tablespace was exported */
 	byte*		m_table_name;		/*!< Exporting instance table
@@ -3090,17 +3087,13 @@ row_import_read_meta_data(
 		return(DB_IO_ERROR);
 	}
 
-	cfg.m_version = mach_read_from_4(row);
-
 	/* Check the version number. */
-	switch (cfg.m_version) {
+	switch (mach_read_from_4(row)) {
 	case IB_EXPORT_CFG_VERSION_V1:
-
 		return(row_import_read_v1(file, thd, &cfg));
 	default:
-		ib_errf(thd, IB_LOG_LEVEL_ERROR, ER_IO_READ_ERROR,
-			"Unsupported meta-data version number (" ULINTPF "), "
-			"file ignored", cfg.m_version);
+		ib_senderrf(thd, IB_LOG_LEVEL_ERROR, ER_NOT_SUPPORTED_YET,
+			    "meta-data version");
 	}
 
 	return(DB_ERROR);