Skip to content

Commit cf6690b

Browse files
mayprasamayprasa
committed
Merge branch 'mysql-8.0' into mysql-trunk
2 parents 421037d + a6d5696 commit cf6690b

File tree

6 files changed

+426
-17
lines changed

6 files changed

+426
-17
lines changed

‎mysql-test/suite/innodb/r/discard_cfg_v4.result‎ renamed to ‎mysql-test/suite/innodb/r/import_cfg.result‎

Lines changed: 198 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -409,11 +409,207 @@ ALTER TABLE t1 DISCARD TABLESPACE;
409409
# Restore the descending key IBD and the v99 version of the CFG.
410410
# Attempt to import the table.
411411
ALTER TABLE t1 IMPORT TABLESPACE;
412-
ERROR HY000: Failed to import test/t1 because the CFG file version (99) is not compatible with the current version (4)
412+
ERROR HY000: Failed to import test/t1 because the CFG file version (99) is not compatible with the current version (5)
413413
SHOW WARNINGS;
414414
Level Code Message
415-
Error 3949 Failed to import test/t1 because the CFG file version (99) is not compatible with the current version (4)
415+
Error 3949 Failed to import test/t1 because the CFG file version (99) is not compatible with the current version (5)
416416
Warning 1816 InnoDB: ALTER TABLE `test`.`t1` IMPORT TABLESPACE failed with error 48 : 'Unsupported'
417417
Error 1112 Table 't1' uses an extension that doesn't exist in this MySQL version
418418
# Cleanup
419419
DROP TABLE t1;
420+
#
421+
# Bug#30191523 : FLUSH TABLE T FOR EXPORT OR ALTER TABLE T2 IMPORT
422+
# TABLESPACE BROKEN IN 8.0.17.
423+
#
424+
# ---------------------- Test 1 ----------------------------------
425+
# Source table has INSTANT columns but target table doesn't
426+
# ----------------------------------------------------------------
427+
# Create source table t1 and add a column INSTANTly
428+
CREATE TABLE t1(id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY);
429+
ALTER TABLE t1 ADD COLUMN v1 VARCHAR(255), ALGORITHM=INSTANT;
430+
ALTER TABLE t1 ADD COLUMN v2 VARCHAR(255), ALGORITHM=INSTANT;
431+
# Insert some data into t1
432+
SELECT * from t1 limit 10;
433+
id v1 v2
434+
1 aaaaaaaaaaaaa bbbbbbbbbbbbbb
435+
2 aaaaaaaaaaaaa bbbbbbbbbbbbbb
436+
3 aaaaaaaaaaaaa bbbbbbbbbbbbbb
437+
4 aaaaaaaaaaaaa bbbbbbbbbbbbbb
438+
5 aaaaaaaaaaaaa bbbbbbbbbbbbbb
439+
6 aaaaaaaaaaaaa bbbbbbbbbbbbbb
440+
7 aaaaaaaaaaaaa bbbbbbbbbbbbbb
441+
8 aaaaaaaaaaaaa bbbbbbbbbbbbbb
442+
9 aaaaaaaaaaaaa bbbbbbbbbbbbbb
443+
10 aaaaaaaaaaaaa bbbbbbbbbbbbbb
444+
SELECT COUNT(*) from t1;
445+
COUNT(*)
446+
1000
447+
SELECT NAME, N_COLS, INSTANT_COLS FROM INFORMATION_SCHEMA.INNODB_TABLES WHERE NAME="test/t1";
448+
NAME N_COLS INSTANT_COLS
449+
test/t1 6 1
450+
SELECT NAME, POS, HAS_DEFAULT from information_Schema.innodb_columns WHERE NAME='v1' OR NAME='v2';
451+
NAME POS HAS_DEFAULT
452+
v1 1 1
453+
v2 2 1
454+
# Flush the table and store CFG/IBD files to temp
455+
FLUSH TABLE t1 FOR EXPORT;
456+
UNLOCK TABLES;
457+
# Create table t2 without INSTANTly added columns
458+
CREATE TABLE t2 LIKE t1;
459+
ALTER TABLE t2 DISCARD TABLESPACE;
460+
# Copy CFG/IBD file from temp
461+
# IMPORT should succeed. Target table metadata should have been updated.
462+
ALTER TABLE t2 IMPORT TABLESPACE;
463+
SELECT * from t2 limit 10;
464+
id v1 v2
465+
1 aaaaaaaaaaaaa bbbbbbbbbbbbbb
466+
2 aaaaaaaaaaaaa bbbbbbbbbbbbbb
467+
3 aaaaaaaaaaaaa bbbbbbbbbbbbbb
468+
4 aaaaaaaaaaaaa bbbbbbbbbbbbbb
469+
5 aaaaaaaaaaaaa bbbbbbbbbbbbbb
470+
6 aaaaaaaaaaaaa bbbbbbbbbbbbbb
471+
7 aaaaaaaaaaaaa bbbbbbbbbbbbbb
472+
8 aaaaaaaaaaaaa bbbbbbbbbbbbbb
473+
9 aaaaaaaaaaaaa bbbbbbbbbbbbbb
474+
10 aaaaaaaaaaaaa bbbbbbbbbbbbbb
475+
SELECT COUNT(*) from t2;
476+
COUNT(*)
477+
1000
478+
SELECT NAME, N_COLS, INSTANT_COLS FROM INFORMATION_SCHEMA.INNODB_TABLES WHERE NAME="test/t1" OR NAME="test/t2";
479+
NAME N_COLS INSTANT_COLS
480+
test/t1 6 1
481+
test/t2 6 1
482+
SELECT NAME, POS, HAS_DEFAULT from information_Schema.innodb_columns WHERE NAME='v1' OR NAME='v2';
483+
NAME POS HAS_DEFAULT
484+
v1 1 1
485+
v2 2 1
486+
v1 1 1
487+
v2 2 1
488+
DROP TABLE t2;
489+
# Create table t2 with one column added INSTANTly
490+
CREATE TABLE t2(id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY, v1 VARCHAR(255));
491+
ALTER TABLE t2 ADD COLUMN v2 VARCHAR(255);
492+
ALTER TABLE t2 DISCARD TABLESPACE;
493+
# Copy CFG/IBD file from temp
494+
# IMPORT should succeed. Target table metadata should have been updated.
495+
ALTER TABLE t2 IMPORT TABLESPACE;
496+
SELECT * from t2 limit 10;
497+
id v1 v2
498+
1 aaaaaaaaaaaaa bbbbbbbbbbbbbb
499+
2 aaaaaaaaaaaaa bbbbbbbbbbbbbb
500+
3 aaaaaaaaaaaaa bbbbbbbbbbbbbb
501+
4 aaaaaaaaaaaaa bbbbbbbbbbbbbb
502+
5 aaaaaaaaaaaaa bbbbbbbbbbbbbb
503+
6 aaaaaaaaaaaaa bbbbbbbbbbbbbb
504+
7 aaaaaaaaaaaaa bbbbbbbbbbbbbb
505+
8 aaaaaaaaaaaaa bbbbbbbbbbbbbb
506+
9 aaaaaaaaaaaaa bbbbbbbbbbbbbb
507+
10 aaaaaaaaaaaaa bbbbbbbbbbbbbb
508+
SELECT COUNT(*) from t2;
509+
COUNT(*)
510+
1000
511+
SELECT NAME, N_COLS, INSTANT_COLS FROM INFORMATION_SCHEMA.INNODB_TABLES WHERE NAME="test/t1" OR NAME="test/t2";
512+
NAME N_COLS INSTANT_COLS
513+
test/t1 6 1
514+
test/t2 6 1
515+
SELECT NAME, POS, HAS_DEFAULT from information_Schema.innodb_columns WHERE NAME='v1' OR NAME='v2';
516+
NAME POS HAS_DEFAULT
517+
v1 1 1
518+
v2 2 1
519+
v1 1 1
520+
v2 2 1
521+
DROP TABLE t2;
522+
# Create table t2 with two column added INSTANTly
523+
CREATE TABLE t2(id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY);
524+
ALTER TABLE t2 ADD COLUMN v1 VARCHAR(255);
525+
ALTER TABLE t2 ADD COLUMN v2 VARCHAR(255);
526+
ALTER TABLE t2 DISCARD TABLESPACE;
527+
# Copy CFG/IBD file from temp
528+
# IMPORT should succeed.
529+
ALTER TABLE t2 IMPORT TABLESPACE;
530+
SELECT * from t2 limit 10;
531+
id v1 v2
532+
1 aaaaaaaaaaaaa bbbbbbbbbbbbbb
533+
2 aaaaaaaaaaaaa bbbbbbbbbbbbbb
534+
3 aaaaaaaaaaaaa bbbbbbbbbbbbbb
535+
4 aaaaaaaaaaaaa bbbbbbbbbbbbbb
536+
5 aaaaaaaaaaaaa bbbbbbbbbbbbbb
537+
6 aaaaaaaaaaaaa bbbbbbbbbbbbbb
538+
7 aaaaaaaaaaaaa bbbbbbbbbbbbbb
539+
8 aaaaaaaaaaaaa bbbbbbbbbbbbbb
540+
9 aaaaaaaaaaaaa bbbbbbbbbbbbbb
541+
10 aaaaaaaaaaaaa bbbbbbbbbbbbbb
542+
SELECT COUNT(*) from t2;
543+
COUNT(*)
544+
1000
545+
SELECT NAME, N_COLS, INSTANT_COLS FROM INFORMATION_SCHEMA.INNODB_TABLES WHERE NAME="test/t1" OR NAME="test/t2";
546+
NAME N_COLS INSTANT_COLS
547+
test/t1 6 1
548+
test/t2 6 1
549+
SELECT NAME, POS, HAS_DEFAULT from information_Schema.innodb_columns WHERE NAME='v1' OR NAME='v2';
550+
NAME POS HAS_DEFAULT
551+
v1 1 1
552+
v2 2 1
553+
v1 1 1
554+
v2 2 1
555+
DROP TABLE t2;
556+
DROP TABLE t1;
557+
# ---------------------- Test 2 ----------------------------------
558+
# Source table doesn't have INSTANT columns but target table does
559+
# ----------------------------------------------------------------
560+
# Create source table t1 and add a column INSTANTly
561+
CREATE TABLE t1(id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY, v1 VARCHAR(255), v2 VARCHAR(255));
562+
# Insert some data into t1
563+
SELECT * from t1 limit 10;
564+
id v1 v2
565+
1 aaaaaaaaaaaaa bbbbbbbbbbbbbb
566+
2 aaaaaaaaaaaaa bbbbbbbbbbbbbb
567+
3 aaaaaaaaaaaaa bbbbbbbbbbbbbb
568+
4 aaaaaaaaaaaaa bbbbbbbbbbbbbb
569+
5 aaaaaaaaaaaaa bbbbbbbbbbbbbb
570+
6 aaaaaaaaaaaaa bbbbbbbbbbbbbb
571+
7 aaaaaaaaaaaaa bbbbbbbbbbbbbb
572+
8 aaaaaaaaaaaaa bbbbbbbbbbbbbb
573+
9 aaaaaaaaaaaaa bbbbbbbbbbbbbb
574+
10 aaaaaaaaaaaaa bbbbbbbbbbbbbb
575+
SELECT COUNT(*) from t1;
576+
COUNT(*)
577+
1000
578+
SELECT NAME, N_COLS, INSTANT_COLS FROM INFORMATION_SCHEMA.INNODB_TABLES WHERE NAME="test/t1";
579+
NAME N_COLS INSTANT_COLS
580+
test/t1 6 0
581+
SELECT NAME, POS, HAS_DEFAULT from information_Schema.innodb_columns WHERE NAME='v1' OR NAME='v2';
582+
NAME POS HAS_DEFAULT
583+
v1 1 0
584+
v2 2 0
585+
# Flush the table and store CFG/IBD files to temp
586+
FLUSH TABLE t1 FOR EXPORT;
587+
UNLOCK TABLES;
588+
# Create table t2 with no INSTANTly added columns
589+
CREATE TABLE t2(id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY, v1 VARCHAR(255), v2 VARCHAR(255));
590+
ALTER TABLE t2 DISCARD TABLESPACE;
591+
# Copy CFG/IBD file from temp
592+
# IMPORT should succeed.
593+
ALTER TABLE t2 IMPORT TABLESPACE;
594+
DROP TABLE t2;
595+
# Create table t2 with 1 INSTANTly added columns
596+
CREATE TABLE t2(id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY, v1 VARCHAR(255));
597+
ALTER TABLE t2 ADD COLUMN v2 VARCHAR(255), ALGORITHM=INSTANT;
598+
ALTER TABLE t2 DISCARD TABLESPACE;
599+
# Copy CFG/IBD file from temp
600+
# IMPORT should fail.
601+
ALTER TABLE t2 IMPORT TABLESPACE;
602+
ERROR HY000: Schema mismatch (The .cfg file indicates no INSTANT column in the source table whereas the metadata in data dictionary says there are instant columns in the target table)
603+
DROP TABLE t2;
604+
# Create table t2 with 2 INSTANTly added columns
605+
CREATE TABLE t2(id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY);
606+
ALTER TABLE t2 ADD COLUMN v1 VARCHAR(255), ALGORITHM=INSTANT;
607+
ALTER TABLE t2 ADD COLUMN v2 VARCHAR(255), ALGORITHM=INSTANT;
608+
ALTER TABLE t2 DISCARD TABLESPACE;
609+
# Copy CFG/IBD file from temp
610+
# IMPORT should fail.
611+
ALTER TABLE t2 IMPORT TABLESPACE;
612+
ERROR HY000: Schema mismatch (The .cfg file indicates no INSTANT column in the source table whereas the metadata in data dictionary says there are instant columns in the target table)
613+
DROP TABLE t2;
614+
# Cleanup
615+
DROP TABLE t1;

‎mysql-test/suite/innodb/t/discard_cfg_v4.test‎ renamed to ‎mysql-test/suite/innodb/t/import_cfg.test‎

Lines changed: 169 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,3 +347,172 @@ DROP TABLE t1;
347347
--remove_file $MYSQLD_DATADIR/$DB/t1.cfg.descend.v4
348348
--remove_file $MYSQLD_DATADIR/$DB/t1.cfg.descend.v99
349349

350+
--echo #
351+
--echo # Bug#30191523 : FLUSH TABLE T FOR EXPORT OR ALTER TABLE T2 IMPORT
352+
--echo # TABLESPACE BROKEN IN 8.0.17.
353+
--echo #
354+
355+
--echo # ---------------------- Test 1 ----------------------------------
356+
--echo # Source table has INSTANT columns but target table doesn't
357+
--echo # ----------------------------------------------------------------
358+
359+
--echo # Create source table t1 and add a column INSTANTly
360+
CREATE TABLE t1(id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY);
361+
ALTER TABLE t1 ADD COLUMN v1 VARCHAR(255), ALGORITHM=INSTANT;
362+
ALTER TABLE t1 ADD COLUMN v2 VARCHAR(255), ALGORITHM=INSTANT;
363+
364+
--echo # Insert some data into t1
365+
--disable_query_log
366+
let $i=1000;
367+
while ($i)
368+
{
369+
INSERT INTO t1(v1, v2) VALUES ("aaaaaaaaaaaaa", "bbbbbbbbbbbbbb");
370+
dec $i;
371+
}
372+
--enable_query_log
373+
374+
SELECT * from t1 limit 10;
375+
SELECT COUNT(*) from t1;
376+
SELECT NAME, N_COLS, INSTANT_COLS FROM INFORMATION_SCHEMA.INNODB_TABLES WHERE NAME="test/t1";
377+
SELECT NAME, POS, HAS_DEFAULT from information_Schema.innodb_columns WHERE NAME='v1' OR NAME='v2';
378+
379+
--echo # Flush the table and store CFG/IBD files to temp
380+
FLUSH TABLE t1 FOR EXPORT;
381+
--copy_file $MYSQLD_DATADIR/test/t1.cfg $MYSQLD_DATADIR/t1.cfg_back
382+
--copy_file $MYSQLD_DATADIR/test/t1.ibd $MYSQLD_DATADIR/t1.ibd_back
383+
UNLOCK TABLES;
384+
385+
--echo # Create table t2 without INSTANTly added columns
386+
CREATE TABLE t2 LIKE t1;
387+
ALTER TABLE t2 DISCARD TABLESPACE;
388+
389+
--echo # Copy CFG/IBD file from temp
390+
--copy_file $MYSQLD_DATADIR/t1.cfg_back $MYSQLD_DATADIR/test/t2.cfg
391+
--copy_file $MYSQLD_DATADIR/t1.ibd_back $MYSQLD_DATADIR/test/t2.ibd
392+
393+
--echo # IMPORT should succeed. Target table metadata should have been updated.
394+
ALTER TABLE t2 IMPORT TABLESPACE;
395+
SELECT * from t2 limit 10;
396+
SELECT COUNT(*) from t2;
397+
SELECT NAME, N_COLS, INSTANT_COLS FROM INFORMATION_SCHEMA.INNODB_TABLES WHERE NAME="test/t1" OR NAME="test/t2";
398+
SELECT NAME, POS, HAS_DEFAULT from information_Schema.innodb_columns WHERE NAME='v1' OR NAME='v2';
399+
400+
DROP TABLE t2;
401+
402+
--echo # Create table t2 with one column added INSTANTly
403+
CREATE TABLE t2(id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY, v1 VARCHAR(255));
404+
ALTER TABLE t2 ADD COLUMN v2 VARCHAR(255);
405+
ALTER TABLE t2 DISCARD TABLESPACE;
406+
407+
--echo # Copy CFG/IBD file from temp
408+
--copy_file $MYSQLD_DATADIR/t1.cfg_back $MYSQLD_DATADIR/test/t2.cfg
409+
--copy_file $MYSQLD_DATADIR/t1.ibd_back $MYSQLD_DATADIR/test/t2.ibd
410+
411+
--echo # IMPORT should succeed. Target table metadata should have been updated.
412+
ALTER TABLE t2 IMPORT TABLESPACE;
413+
SELECT * from t2 limit 10;
414+
SELECT COUNT(*) from t2;
415+
SELECT NAME, N_COLS, INSTANT_COLS FROM INFORMATION_SCHEMA.INNODB_TABLES WHERE NAME="test/t1" OR NAME="test/t2";
416+
SELECT NAME, POS, HAS_DEFAULT from information_Schema.innodb_columns WHERE NAME='v1' OR NAME='v2';
417+
418+
DROP TABLE t2;
419+
420+
--echo # Create table t2 with two column added INSTANTly
421+
CREATE TABLE t2(id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY);
422+
ALTER TABLE t2 ADD COLUMN v1 VARCHAR(255);
423+
ALTER TABLE t2 ADD COLUMN v2 VARCHAR(255);
424+
ALTER TABLE t2 DISCARD TABLESPACE;
425+
426+
--echo # Copy CFG/IBD file from temp
427+
--copy_file $MYSQLD_DATADIR/t1.cfg_back $MYSQLD_DATADIR/test/t2.cfg
428+
--copy_file $MYSQLD_DATADIR/t1.ibd_back $MYSQLD_DATADIR/test/t2.ibd
429+
430+
--echo # IMPORT should succeed.
431+
ALTER TABLE t2 IMPORT TABLESPACE;
432+
SELECT * from t2 limit 10;
433+
SELECT COUNT(*) from t2;
434+
SELECT NAME, N_COLS, INSTANT_COLS FROM INFORMATION_SCHEMA.INNODB_TABLES WHERE NAME="test/t1" OR NAME="test/t2";
435+
SELECT NAME, POS, HAS_DEFAULT from information_Schema.innodb_columns WHERE NAME='v1' OR NAME='v2';
436+
437+
DROP TABLE t2;
438+
DROP TABLE t1;
439+
--remove_file $MYSQLD_DATADIR/t1.cfg_back
440+
--remove_file $MYSQLD_DATADIR/t1.ibd_back
441+
442+
--echo # ---------------------- Test 2 ----------------------------------
443+
--echo # Source table doesn't have INSTANT columns but target table does
444+
--echo # ----------------------------------------------------------------
445+
--echo # Create source table t1 and add a column INSTANTly
446+
CREATE TABLE t1(id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY, v1 VARCHAR(255), v2 VARCHAR(255));
447+
448+
--echo # Insert some data into t1
449+
--disable_query_log
450+
let $i=1000;
451+
while ($i)
452+
{
453+
INSERT INTO t1(v1, v2) VALUES ("aaaaaaaaaaaaa", "bbbbbbbbbbbbbb");
454+
dec $i;
455+
}
456+
--enable_query_log
457+
458+
SELECT * from t1 limit 10;
459+
SELECT COUNT(*) from t1;
460+
SELECT NAME, N_COLS, INSTANT_COLS FROM INFORMATION_SCHEMA.INNODB_TABLES WHERE NAME="test/t1";
461+
SELECT NAME, POS, HAS_DEFAULT from information_Schema.innodb_columns WHERE NAME='v1' OR NAME='v2';
462+
463+
--echo # Flush the table and store CFG/IBD files to temp
464+
FLUSH TABLE t1 FOR EXPORT;
465+
--copy_file $MYSQLD_DATADIR/test/t1.cfg $MYSQLD_DATADIR/t1.cfg_back
466+
--copy_file $MYSQLD_DATADIR/test/t1.ibd $MYSQLD_DATADIR/t1.ibd_back
467+
UNLOCK TABLES;
468+
469+
--echo # Create table t2 with no INSTANTly added columns
470+
CREATE TABLE t2(id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY, v1 VARCHAR(255), v2 VARCHAR(255));
471+
ALTER TABLE t2 DISCARD TABLESPACE;
472+
473+
--echo # Copy CFG/IBD file from temp
474+
--copy_file $MYSQLD_DATADIR/t1.cfg_back $MYSQLD_DATADIR/test/t2.cfg
475+
--copy_file $MYSQLD_DATADIR/t1.ibd_back $MYSQLD_DATADIR/test/t2.ibd
476+
477+
--echo # IMPORT should succeed.
478+
ALTER TABLE t2 IMPORT TABLESPACE;
479+
DROP TABLE t2;
480+
481+
--echo # Create table t2 with 1 INSTANTly added columns
482+
CREATE TABLE t2(id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY, v1 VARCHAR(255));
483+
ALTER TABLE t2 ADD COLUMN v2 VARCHAR(255), ALGORITHM=INSTANT;
484+
ALTER TABLE t2 DISCARD TABLESPACE;
485+
486+
--echo # Copy CFG/IBD file from temp
487+
--copy_file $MYSQLD_DATADIR/t1.cfg_back $MYSQLD_DATADIR/test/t2.cfg
488+
--copy_file $MYSQLD_DATADIR/t1.ibd_back $MYSQLD_DATADIR/test/t2.ibd
489+
490+
--echo # IMPORT should fail.
491+
--error ER_TABLE_SCHEMA_MISMATCH
492+
ALTER TABLE t2 IMPORT TABLESPACE;
493+
DROP TABLE t2;
494+
--remove_file $MYSQLD_DATADIR/test/t2.cfg
495+
--remove_file $MYSQLD_DATADIR/test/t2.ibd
496+
497+
--echo # Create table t2 with 2 INSTANTly added columns
498+
CREATE TABLE t2(id INT UNSIGNED AUTO_INCREMENT PRIMARY KEY);
499+
ALTER TABLE t2 ADD COLUMN v1 VARCHAR(255), ALGORITHM=INSTANT;
500+
ALTER TABLE t2 ADD COLUMN v2 VARCHAR(255), ALGORITHM=INSTANT;
501+
ALTER TABLE t2 DISCARD TABLESPACE;
502+
503+
--echo # Copy CFG/IBD file from temp
504+
--copy_file $MYSQLD_DATADIR/t1.cfg_back $MYSQLD_DATADIR/test/t2.cfg
505+
--copy_file $MYSQLD_DATADIR/t1.ibd_back $MYSQLD_DATADIR/test/t2.ibd
506+
507+
--echo # IMPORT should fail.
508+
--error ER_TABLE_SCHEMA_MISMATCH
509+
ALTER TABLE t2 IMPORT TABLESPACE;
510+
DROP TABLE t2;
511+
--remove_file $MYSQLD_DATADIR/test/t2.cfg
512+
--remove_file $MYSQLD_DATADIR/test/t2.ibd
513+
514+
--echo # Cleanup
515+
DROP TABLE t1;
516+
--remove_file $MYSQLD_DATADIR/t1.cfg_back
517+
--remove_file $MYSQLD_DATADIR/t1.ibd_back
518+

‎storage/innobase/include/row0quiesce.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ struct trx_t;
4747
#define IB_EXPORT_CFG_VERSION_V3 3
4848
/** The v4 .cfg has the is_ascending boolean written for each index column. */
4949
#define IB_EXPORT_CFG_VERSION_V4 4
50+
/** The v5 .cfg writes number of nullable column in table before first instant
51+
* column. */
52+
#define IB_EXPORT_CFG_VERSION_V5 5
5053
/** Future version used to test that the correct error message is returned. */
5154
#define IB_EXPORT_CFG_VERSION_V99 99
5255

0 commit comments

Comments
 (0)