diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-01-30 09:46:52 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-01-30 09:46:52 +0100 |
| commit | a576a1cea5b0f06fb8fff0fbdb9035d89510b83a (patch) | |
| tree | d25987402c55bdaec0897ab28c236acfa50116ef /mysql-test/suite/innodb_zip | |
| parent | 12cad0c3468d734e041d4ef0cd5a26d2a28606fc (diff) | |
| parent | 41a163ac5ccf4ac5394edc84e40b3f47acea6b08 (diff) | |
| download | mariadb-git-a576a1cea5b0f06fb8fff0fbdb9035d89510b83a.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'mysql-test/suite/innodb_zip')
| -rw-r--r-- | mysql-test/suite/innodb_zip/r/wl5522_zip.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/innodb_zip/t/restart.test | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb_zip/r/wl5522_zip.result b/mysql-test/suite/innodb_zip/r/wl5522_zip.result index 49121b906ce..210b3b1b0d6 100644 --- a/mysql-test/suite/innodb_zip/r/wl5522_zip.result +++ b/mysql-test/suite/innodb_zip/r/wl5522_zip.result @@ -319,7 +319,7 @@ SELECT * FROM t1; ERROR HY000: Tablespace has been discarded for table `t1` restore: t1 .ibd and .cfg files ALTER TABLE t1 IMPORT TABLESPACE; -ERROR HY000: Schema mismatch (Number of columns don't match, table has 6 columns but the tablespace meta-data file has 5 columns) +ERROR HY000: Schema mismatch (Column c3 not found in tablespace.) unlink: t1.ibd unlink: t1.cfg DROP TABLE t1; diff --git a/mysql-test/suite/innodb_zip/t/restart.test b/mysql-test/suite/innodb_zip/t/restart.test index e0e42a682ab..6962d62b21f 100644 --- a/mysql-test/suite/innodb_zip/t/restart.test +++ b/mysql-test/suite/innodb_zip/t/restart.test @@ -5,6 +5,7 @@ --source include/have_partition.inc --source include/not_embedded.inc --source include/innodb_checksum_algorithm.inc +--source include/have_symlink.inc SET default_storage_engine=InnoDB; LET $MYSQLD_DATADIR = `select @@datadir`; |