Adjust storage_engine suite according to server changes in 10.2

mysql-test/suite/storage_engine/alter_table.result

@@ -13,7 +13,7 @@ ALTER TABLE t1 ALTER COLUMN a SET DEFAULT '0';
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `a` int(11) DEFAULT '0',
+  `a` int(11) DEFAULT 0,
   `c` char(8) DEFAULT NULL,
   `b` int(11) DEFAULT NULL
 ) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1

mysql-test/suite/storage_engine/alter_tablespace.result

@@ -10,7 +10,7 @@ a
 2
 ALTER TABLE t1 DISCARD TABLESPACE;
 SELECT a FROM t1;
-ERROR HY000: Tablespace has been discarded for table 't1'
+ERROR HY000: Tablespace has been discarded for table `t1`
 ALTER TABLE t1 IMPORT TABLESPACE;
 Warnings:
 Warning	1810	IO Read error: (2, No such file or directory) Error opening './test/t1.cfg', will attempt to import without schema verification

mysql-test/suite/storage_engine/create_table.result

@@ -27,7 +27,7 @@ CREATE TABLE t1 ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> AS SELECT 1 UNION
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
-  `1` bigint(20) NOT NULL DEFAULT '0'
+  `1` bigint(20) NOT NULL DEFAULT 0
 ) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1
 SELECT * FROM t1;
 1

mysql-test/suite/storage_engine/disabled.def

+alter_table_online : MDEV-9705 - Field type conversion warnings have changed to worse
+col_opt_null       : MDEV-10252 - Row count in 'out of range' warnings is off
+col_opt_not_null   : MDEV-10252 - Row count in 'out of range' warnings is off
+col_opt_unsigned   : MDEV-10252 - Row count in 'out of range' warnings is off
+col_opt_zerofill   : MDEV-10252 - Row count in 'out of range' warnings is off
+type_binary        : MDEV-10252 - Row count in 'out of range' warnings is off
+type_char          : MDEV-10252 - Row count in 'out of range' warnings is off
+type_fixed         : MDEV-10252 - Row count in 'out of range' warnings is off
+type_float         : MDEV-10252 - Row count in 'out of range' warnings is off
+type_int           : MDEV-10252 - Row count in 'out of range' warnings is off
+type_varbinary     : MDEV-10252 - Row count in 'out of range' warnings is off
+type_varchar       : MDEV-10252 - Row count in 'out of range' warnings is off

mysql-test/suite/storage_engine/insert_delayed.test

-# 
+#
 # INSERT DELAYED
 #
 

mysql-test/suite/storage_engine/repair_table.inc

@@ -91,6 +91,9 @@ if ($have_default_index)
   call mtr.add_suppression(" '\..test.t1'");
   call mtr.add_suppression("Couldn't repair table: test.t1");
 
+  # In 10.2 with log_warnings=2 the error message is printed to the error log
+  call mtr.add_suppression("Table 't1' is marked as crashed.*");
+
   --let $create_definition = a $int_indexed_col, b $char_col, $default_index (a)
   --source create_table.inc
   REPAIR TABLE t1;

mysql-test/suite/storage_engine/repair_table.result

@@ -59,6 +59,7 @@ call mtr.add_suppression("Got an error from thread_id=.*");
 call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*root Checking table");
 call mtr.add_suppression(" '\..test.t1'");
 call mtr.add_suppression("Couldn't repair table: test.t1");
+call mtr.add_suppression("Table 't1' is marked as crashed.*");
 CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>, <CUSTOM_INDEX> (a)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
 REPAIR TABLE t1;
 Table	Op	Msg_type	Msg_text
@@ -85,7 +86,7 @@ Table	Op	Msg_type	Msg_text
 test.t1	check	error	Size of datafile is: 39         Should be: 65
 test.t1	check	error	Corrupt
 SELECT a,b FROM t1;
-ERROR HY000: Incorrect key file for table 't1'; try to repair it
+ERROR HY000: Index for table 't1' is corrupt; try to repair it
 # Statement ended with one of expected results (0,ER_NOT_KEYFILE,144). 
 # If you got a difference in error message, just add it to rdiff file
 INSERT INTO t1 (a,b) VALUES (14,'n'),(15,'o');

mysql-test/suite/storage_engine/tbl_opt_data_index_dir.result → mysql-test/suite/storage_engine/tbl_opt_data_dir.result

 DROP TABLE IF EXISTS t1;
+# Running CREATE TABLE .. DATA DIRECTORY = <>
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` char(8) DEFAULT NULL
-) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 DATA DIRECTORY='<DATA_DIR>' INDEX DIRECTORY='<INDEX_DIR>'
+) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 DATA DIRECTORY='<DATA_DIR_1>'
+# For ALTER TABLE the option is ignored
+# Running ALTER TABLE .. DATA DIRECTORY = <>
 Warnings:
-Warning	1618	<INDEX DIRECTORY> option ignored
+Warning	1618	<DATA DIRECTORY> option ignored
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` char(8) DEFAULT NULL
-) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 DATA DIRECTORY='<DATA_DIR>' INDEX DIRECTORY='<INDEX_DIR>'
+) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 DATA DIRECTORY='<DATA_DIR_1>'
 DROP TABLE t1;

mysql-test/suite/storage_engine/tbl_opt_data_index_dir.test → mysql-test/suite/storage_engine/tbl_opt_data_dir.test

 # 
-# Check whether DATA DIRECTORY and INDEX DIRECTORY
-# are supported in CREATE and ALTER TABLE
+# Check whether DATA DIRECTORY is supported in CREATE and ALTER TABLE
 #
-# Note: the test does not check whether the options
-#       have any real effect on the table, only 
-#       that they are accepted
+# Note: the test does not check whether the option
+#       has any real effect on the table, only  that it is accepted
 # 
 
 --source include/have_symlink.inc
 --source have_engine.inc
 
---let $data_dir = $MYSQLTEST_VARDIR/storage_engine_data_dir/
---let $index_dir = $MYSQLTEST_VARDIR/storage_engine_index_dir/
---mkdir $data_dir
---mkdir $index_dir
+--let $data_dir1 = $MYSQLTEST_VARDIR/storage_engine_data_dir1/
+--let $data_dir2 = $MYSQLTEST_VARDIR/storage_engine_data_dir2/
+--mkdir $data_dir1
+--mkdir $data_dir2
 
 --disable_warnings
 DROP TABLE IF EXISTS t1;
 --enable_warnings
 
---let $table_options = DATA DIRECTORY = '$data_dir' INDEX DIRECTORY = '$index_dir'
-# We cannot mask the folders name here, but we can switch off query logging
+--let $table_options = DATA DIRECTORY = '$data_dir1'
+# We cannot mask the folder name here and further, but we can switch off query logging
 --let $disable_query_log = 1
+--echo # Running CREATE TABLE .. DATA DIRECTORY = <>
 --source create_table.inc
 
 --source mask_engine.inc
---replace_result $data_dir <DATA_DIR> $index_dir <INDEX_DIR>
+--replace_result $data_dir1 <DATA_DIR_1>
 SHOW CREATE TABLE t1;
 
---let $alter_definition = INDEX DIRECTORY = '$data_dir'
+--echo # For ALTER TABLE the option is ignored
+
+--let $alter_definition = DATA DIRECTORY = '$data_dir2'
 --disable_query_log
+--echo # Running ALTER TABLE .. DATA DIRECTORY = <>
 --source alter_table.inc
 if ($mysql_errname)
 {
@@ -39,14 +41,12 @@ if ($mysql_errname)
 }
 --enable_query_log
 --source mask_engine.inc
---replace_result $data_dir <DATA_DIR> $index_dir <INDEX_DIR> 
+--replace_result $data_dir1 <DATA_DIR_1> 
 SHOW CREATE TABLE t1;
 
 DROP TABLE t1;
 
 --source cleanup_engine.inc
 
---rmdir $data_dir
---rmdir $index_dir
-
-
+--rmdir $data_dir1
+--rmdir $data_dir2

mysql-test/suite/storage_engine/tbl_opt_index_dir.result

+DROP TABLE IF EXISTS t1;
+# Running CREATE TABLE .. INDEX DIRECTORY = <>
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(11) DEFAULT NULL,
+  `b` char(8) DEFAULT NULL
+) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 INDEX DIRECTORY='<INDEX_DIR_1>'
+# For ALTER TABLE the option is ignored
+# Running ALTER TABLE .. INDEX DIRECTORY = <>
+Warnings:
+Warning	1618	<INDEX DIRECTORY> option ignored
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(11) DEFAULT NULL,
+  `b` char(8) DEFAULT NULL
+) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 INDEX DIRECTORY='<INDEX_DIR_1>'
+DROP TABLE t1;

mysql-test/suite/storage_engine/tbl_opt_index_dir.test

+# 
+# Check whether INDEX DIRECTORY is supported in CREATE and ALTER TABLE
+#
+# Note: the test does not check whether the option
+#       has any real effect on the table, only  that it is accepted
+# 
+
+--source include/have_symlink.inc
+--source have_engine.inc
+
+--let $index_dir1 = $MYSQLTEST_VARDIR/storage_engine_index_dir1/
+--let $index_dir2 = $MYSQLTEST_VARDIR/storage_engine_index_dir2/
+--mkdir $index_dir1
+--mkdir $index_dir2
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+--enable_warnings
+
+--let $table_options = INDEX DIRECTORY = '$index_dir1'
+# We cannot mask the folder name here and further, but we can switch off query logging
+--let $disable_query_log = 1
+--echo # Running CREATE TABLE .. INDEX DIRECTORY = <>
+--source create_table.inc
+
+--source mask_engine.inc
+--replace_result $index_dir1 <INDEX_DIR_1>
+SHOW CREATE TABLE t1;
+
+--echo # For ALTER TABLE the option is ignored
+
+--let $alter_definition = INDEX DIRECTORY = '$index_dir2'
+--disable_query_log
+--echo # Running ALTER TABLE .. INDEX DIRECTORY = <>
+--source alter_table.inc
+if ($mysql_errname)
+{
+  --let $my_last_stmt = $alter_statement
+  --let $functionality = ALTER TABLE
+  --source unexpected_result.inc
+}
+--enable_query_log
+--source mask_engine.inc
+--replace_result $index_dir1 <INDEX_DIR_1>
+SHOW CREATE TABLE t1;
+
+DROP TABLE t1;
+
+--source cleanup_engine.inc
+
+--rmdir $index_dir1
+--rmdir $index_dir2

mysql-test/suite/storage_engine/tbl_opt_row_format.result

 DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> ROW_FORMAT=FIXED;
+CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> ROW_FORMAT=DYNAMIC;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(11) DEFAULT NULL,
+  `b` char(8) DEFAULT NULL
+) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
+ALTER TABLE t1 ROW_FORMAT=FIXED;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` char(8) DEFAULT NULL
 ) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED
-ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
+ALTER TABLE t1 ROW_FORMAT=PAGE;
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
   `a` int(11) DEFAULT NULL,
   `b` char(8) DEFAULT NULL
-) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
+) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 ROW_FORMAT=PAGE
+ALTER TABLE t1 ROW_FORMAT=COMPACT;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` int(11) DEFAULT NULL,
+  `b` char(8) DEFAULT NULL
+) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
 DROP TABLE t1;

mysql-test/suite/storage_engine/tbl_opt_row_format.test

@@ -13,12 +13,12 @@
 DROP TABLE IF EXISTS t1;
 --enable_warnings
 
---let $table_options = ROW_FORMAT=FIXED
+--let $table_options = ROW_FORMAT=DYNAMIC
 --source create_table.inc
 --source mask_engine.inc
 SHOW CREATE TABLE t1;
 
---let $alter_definition = ROW_FORMAT=DYNAMIC
+--let $alter_definition = ROW_FORMAT=FIXED
 --source alter_table.inc
 if ($mysql_errname)
 {
@@ -29,6 +29,30 @@ if ($mysql_errname)
 --source mask_engine.inc
 SHOW CREATE TABLE t1;
 
+--let $alter_definition = ROW_FORMAT=PAGE
+--source alter_table.inc
+if ($mysql_errname)
+{
+  --let $my_last_stmt = $alter_statement
+  --let $functionality = ALTER TABLE
+  --source unexpected_result.inc
+}
+--source mask_engine.inc
+SHOW CREATE TABLE t1;
+
+
+--let $alter_definition = ROW_FORMAT=COMPACT
+--source alter_table.inc
+if ($mysql_errname)
+{
+  --let $my_last_stmt = $alter_statement
+  --let $functionality = ALTER TABLE
+  --source unexpected_result.inc
+}
+--source mask_engine.inc
+SHOW CREATE TABLE t1;
+
+
 DROP TABLE t1;
 
 --source cleanup_engine.inc

mysql-test/suite/storage_engine/type_char_indexes.result

@@ -97,7 +97,7 @@ varchar2b	1
 varchar3b	1
 SET SESSION optimizer_switch = 'engine_condition_pushdown=on';
 Warnings:
-Warning	1681	'engine_condition_pushdown=on' is deprecated and will be removed in a future release.
+Warning	1681	'engine_condition_pushdown=on' is deprecated and will be removed in a future release
 EXPLAIN SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a';
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 #	#	#	range	c_v	c_v	#	#	#	Using index condition

mysql-test/suite/storage_engine/type_date_time.result

@@ -13,7 +13,7 @@ SHOW COLUMNS IN t1;
 Field	Type	Null	Key	Default	Extra
 d	date	#	#	#	
 dt	datetime	#	#	#	
-ts	timestamp	#	#	#	on update CURRENT_TIMESTAMP
+ts	timestamp	#	#	#	on update current_timestamp()
 t	time	#	#	#	
 y	year(4)	#	#	#	
 y4	year(4)	#	#	#	

mysql-test/suite/storage_engine/vcol.result

@@ -3,12 +3,12 @@ CREATE TABLE t1 (a <INT_COLUMN>, b <INT_COLUMN> GENERATED ALWAYS AS (a+1)) ENGIN
 SHOW COLUMNS IN t1;
 Field	Type	Null	Key	Default	Extra
 a	int(11)	#		#	
-b	int(11)	#		#	VIRTUAL
+b	int(11)	#		#	VIRTUAL GENERATED
 INSERT INTO t1 (a) VALUES (1),(2);
 INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
 Warnings:
-Warning	1906	The value specified for computed column 'b' in table 't1' ignored
-Warning	1906	The value specified for computed column 'b' in table 't1' ignored
+Warning	1906	The value specified for generated column 'b' in table 't1' ignored
+Warning	1906	The value specified for generated column 'b' in table 't1' ignored
 SELECT a,b FROM t1;
 a	b
 1	2
@@ -20,12 +20,12 @@ CREATE TABLE t1 (a <INT_COLUMN>, b <INT_COLUMN> GENERATED ALWAYS AS (a+1) PERSIS
 SHOW COLUMNS IN t1;
 Field	Type	Null	Key	Default	Extra
 a	int(11)	#		#	
-b	int(11)	#		#	PERSISTENT
+b	int(11)	#		#	STORED GENERATED
 INSERT INTO t1 (a) VALUES (1),(2);
 INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
 Warnings:
-Warning	1906	The value specified for computed column 'b' in table 't1' ignored
-Warning	1906	The value specified for computed column 'b' in table 't1' ignored
+Warning	1906	The value specified for generated column 'b' in table 't1' ignored
+Warning	1906	The value specified for generated column 'b' in table 't1' ignored
 SELECT a,b FROM t1;
 a	b
 1	2
@@ -37,12 +37,12 @@ CREATE TABLE t1 (a <INT_COLUMN>, b <INT_COLUMN> GENERATED ALWAYS AS (a+1) VIRTUA
 SHOW COLUMNS IN t1;
 Field	Type	Null	Key	Default	Extra
 a	int(11)	#		#	
-b	int(11)	#		#	VIRTUAL
+b	int(11)	#		#	VIRTUAL GENERATED
 INSERT INTO t1 (a) VALUES (1),(2);
 INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
 Warnings:
-Warning	1906	The value specified for computed column 'b' in table 't1' ignored
-Warning	1906	The value specified for computed column 'b' in table 't1' ignored
+Warning	1906	The value specified for generated column 'b' in table 't1' ignored
+Warning	1906	The value specified for generated column 'b' in table 't1' ignored
 SELECT a,b FROM t1;
 a	b
 1	2
@@ -54,12 +54,12 @@ CREATE TABLE t1 (a <INT_COLUMN>, b <INT_COLUMN> AS (a+1) PERSISTENT) ENGINE=<STO
 SHOW COLUMNS IN t1;
 Field	Type	Null	Key	Default	Extra
 a	int(11)	#		#	
-b	int(11)	#		#	PERSISTENT
+b	int(11)	#		#	STORED GENERATED
 INSERT INTO t1 (a) VALUES (1),(2);
 INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
 Warnings:
-Warning	1906	The value specified for computed column 'b' in table 't1' ignored
-Warning	1906	The value specified for computed column 'b' in table 't1' ignored
+Warning	1906	The value specified for generated column 'b' in table 't1' ignored
+Warning	1906	The value specified for generated column 'b' in table 't1' ignored
 SELECT a,b FROM t1;
 a	b
 1	2

storage/innobase/mysql-test/storage_engine/disabled.def

@@ -4,4 +4,6 @@ insert_high_prio : InnoDB does not use table-level locking
 insert_low_prio : InnoDB does not use table-level locking
 select_high_prio : InnoDB does not use table-level locking
 update_low_prio : InnoDB does not use table-level locking
-
+insert_delayed    : MDEV-12880 - INSERT DELAYED is not detected as inapplicable to a table under lock
+lock_concurrent   : MDEV-12882 - Assertion failure
+tbl_opt_index_dir : INDEX DIRECTORY option is not supported anymore

storage/innobase/mysql-test/storage_engine/repair_table.rdiff

@@ -111,7 +111,7 @@
 -test.t1	check	error	Corrupt
 +test.t1	check	status	OK
  SELECT a,b FROM t1;
--ERROR HY000: Incorrect key file for table 't1'; try to repair it
+-ERROR HY000: Index for table 't1' is corrupt; try to repair it
 -# Statement ended with one of expected results (0,ER_NOT_KEYFILE,144). 
 -# If you got a difference in error message, just add it to rdiff file
 -INSERT INTO t1 (a,b) VALUES (14,'n'),(15,'o');

storage/innobase/mysql-test/storage_engine/suite.opt

---innodb --ignore-builtin-innodb --plugin-load=ha_innodb
+--innodb

storage/innobase/mysql-test/storage_engine/tbl_opt_row_format.rdiff

---- suite/storage_engine/tbl_opt_row_format.result	2012-06-24 23:55:19.539380000 +0400
-+++ suite/storage_engine/tbl_opt_row_format.reject	2012-07-15 19:26:02.235049157 +0400
-@@ -1,5 +1,7 @@
- DROP TABLE IF EXISTS t1;
- CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> ROW_FORMAT=FIXED;
-+Warnings:
-+Warning	1478	<STORAGE_ENGINE>: assuming ROW_FORMAT=COMPACT.
+--- ../storage/innobase/mysql-test/storage_engine/tbl_opt_row_format.result~	2017-05-24 00:40:12.854181048 +0300
++++ ../storage/innobase/mysql-test/storage_engine/tbl_opt_row_format.reject	2017-05-24 00:49:06.578191030 +0300
+@@ -7,19 +7,39 @@
+   `b` char(8) DEFAULT NULL
+ ) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
+ ALTER TABLE t1 ROW_FORMAT=FIXED;
++ERROR HY000: Table storage engine '<STORAGE_ENGINE>' does not support the create option 'ROW_TYPE'
++# ERROR: Statement ended with errno 1478, errname ER_ILLEGAL_HA_CREATE_OPTION (expected to succeed)
++# ------------ UNEXPECTED RESULT ------------
++# [ ALTER TABLE t1 ROW_FORMAT=FIXED ]
++# The statement|command finished with ER_ILLEGAL_HA_CREATE_OPTION.
++# ALTER TABLE or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. 
++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def.
++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped.
++# Also, this problem may cause a chain effect (more errors of different kinds in the test).
++# -------------------------------------------
  SHOW CREATE TABLE t1;
  Table	Create Table
  t1	CREATE TABLE `t1` (
+   `a` int(11) DEFAULT NULL,
+   `b` char(8) DEFAULT NULL
+-) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED
++) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
+ ALTER TABLE t1 ROW_FORMAT=PAGE;
++ERROR HY000: Table storage engine '<STORAGE_ENGINE>' does not support the create option 'ROW_TYPE'
++# ERROR: Statement ended with errno 1478, errname ER_ILLEGAL_HA_CREATE_OPTION (expected to succeed)
++# ------------ UNEXPECTED RESULT ------------
++# [ ALTER TABLE t1 ROW_FORMAT=PAGE ]
++# The statement|command finished with ER_ILLEGAL_HA_CREATE_OPTION.
++# ALTER TABLE or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. 
++# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def.
++# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped.
++# Also, this problem may cause a chain effect (more errors of different kinds in the test).
++# -------------------------------------------
+ SHOW CREATE TABLE t1;
+ Table	Create Table
+ t1	CREATE TABLE `t1` (
+   `a` int(11) DEFAULT NULL,
+   `b` char(8) DEFAULT NULL
+-) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 ROW_FORMAT=PAGE
++) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
+ ALTER TABLE t1 ROW_FORMAT=COMPACT;
+ SHOW CREATE TABLE t1;
+ Table	Create Table

storage/myisam/mysql-test/storage_engine/alter_tablespace.rdiff

@@ -13,7 +13,7 @@
 -2
 -ALTER TABLE t1 DISCARD TABLESPACE;
 -SELECT a FROM t1;
--ERROR HY000: Tablespace has been discarded for table 't1'
+-ERROR HY000: Tablespace has been discarded for table `t1`
 -ALTER TABLE t1 IMPORT TABLESPACE;
 -Warnings:
 -Warning	1810	IO Read error: (2, No such file or directory) Error opening './test/t1.cfg', will attempt to import without schema verification

storage/myisammrg/mysql-test/storage_engine/alter_tablespace.rdiff

@@ -13,7 +13,7 @@
 -2
 -ALTER TABLE t1 DISCARD TABLESPACE;
 -SELECT a FROM t1;
--ERROR HY000: Tablespace has been discarded for table 't1'
+-ERROR HY000: Tablespace has been discarded for table `t1`
 -ALTER TABLE t1 IMPORT TABLESPACE;
 -Warnings:
 -Warning	1810	IO Read error: (2, No such file or directory) Error opening './test/t1.cfg', will attempt to import without schema verification

storage/myisammrg/mysql-test/storage_engine/create_table.rdiff

@@ -29,7 +29,7 @@
 -SHOW CREATE TABLE t1;
 -Table	Create Table
 -t1	CREATE TABLE `t1` (
--  `1` bigint(20) NOT NULL DEFAULT '0'
+-  `1` bigint(20) NOT NULL DEFAULT 0
 -) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1
 -SELECT * FROM t1;
 -1

storage/myisammrg/mysql-test/storage_engine/disabled.def

+insert_delayed   : MDEV-12880 - INSERT DELAYED is not detected as inapplicable to a table under lock
+lock_concurrent  : MDEV-12882 - Assertion failure
+select_high_prio : MDEV-12885 - MDL_SHARED_READ_ONLY is taken instead of MDL_SHARED_READ

storage/myisammrg/mysql-test/storage_engine/parts/repair_table.rdiff

---- repair_table.result	2013-01-23 01:35:44.388267080 +0400
-+++ repair_table.reject	2013-01-23 03:16:26.468307847 +0400
-@@ -1,234 +1,114 @@
+--- suite/storage_engine/parts/repair_table.result	2017-05-20 03:58:19.451939791 +0300
++++ ../storage/myisammrg/mysql-test/storage_engine/parts/repair_table.reject	2017-05-24 02:42:31.130318292 +0300
+@@ -1,234 +1,115 @@
  call mtr.add_suppression("Table '.*t1.*' is marked as crashed and should be repaired");
  DROP TABLE IF EXISTS t1, t2;
  CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> PARTITION BY HASH(a) PARTITIONS 2;
@@ -144,6 +144,7 @@
  call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*root Checking table");
  call mtr.add_suppression(" '\..test.t1'");
  call mtr.add_suppression("Couldn't repair table: test.t1");
++call mtr.add_suppression("Table 't1' is marked as crashed.*");
  CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>, <CUSTOM_INDEX> (a)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> PARTITION BY HASH(a) PARTITIONS 2;
 +ERROR HY000: Engine cannot be used in partitioned tables
 +# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed)

storage/myisammrg/mysql-test/storage_engine/repair_table.rdiff

---- repair_table.result	2013-01-23 01:26:05.995538460 +0400
-+++ repair_table.reject	2013-01-23 02:50:55.035560564 +0400
+--- suite/storage_engine/repair_table.result	2017-05-24 01:09:07.274213486 +0300
++++ suite/storage_engine/repair_table.reject	2017-05-24 01:10:25.466214949 +0300
 @@ -4,56 +4,50 @@
  CREATE TABLE t2 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
  REPAIR TABLE t1;
@@ -71,7 +71,7 @@
  DROP TABLE t1, t2;
  call mtr.add_suppression("Got an error from thread_id=.*");
  call mtr.add_suppression("MySQL thread id .*, query id .* localhost.*root Checking table");
-@@ -62,45 +56,32 @@
+@@ -63,45 +57,32 @@
  CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>, <CUSTOM_INDEX> (a)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
  REPAIR TABLE t1;
  Table	Op	Msg_type	Msg_text
@@ -104,7 +104,7 @@
 -test.t1	check	error	Corrupt
 +test.t1	check	status	OK
  SELECT a,b FROM t1;
--ERROR HY000: Incorrect key file for table 't1'; try to repair it
+-ERROR HY000: Index for table 't1' is corrupt; try to repair it
 -# Statement ended with one of expected results (0,ER_NOT_KEYFILE,144). 
 -# If you got a difference in error message, just add it to rdiff file
 -INSERT INTO t1 (a,b) VALUES (14,'n'),(15,'o');

storage/myisammrg/mysql-test/storage_engine/tbl_opt_data_index_dir.rdiff → storage/myisammrg/mysql-test/storage_engine/tbl_opt_data_dir.rdiff

---- tbl_opt_data_index_dir.result	2013-01-22 22:05:05.246633000 +0400
-+++ tbl_opt_data_index_dir.reject	2013-01-23 02:50:59.951498762 +0400
-@@ -4,7 +4,7 @@
+--- suite/storage_engine/tbl_opt_data_dir.result	2017-05-24 00:21:15.550159778 +0300
++++ ../storage/myisammrg/mysql-test/storage_engine/tbl_opt_data_dir.reject	2017-05-24 00:25:45.506164827 +0300
+@@ -5,7 +5,7 @@
  t1	CREATE TABLE `t1` (
    `a` int(11) DEFAULT NULL,
    `b` char(8) DEFAULT NULL
--) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 DATA DIRECTORY='<DATA_DIR>' INDEX DIRECTORY='<INDEX_DIR>'
+-) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 DATA DIRECTORY='<DATA_DIR_1>'
 +) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`)
+ # For ALTER TABLE the option is ignored
+ # Running ALTER TABLE .. DATA DIRECTORY = <>
  Warnings:
- Warning	1618	<INDEX DIRECTORY> option ignored
- SHOW CREATE TABLE t1;
-@@ -12,5 +12,5 @@
+@@ -15,5 +15,5 @@
  t1	CREATE TABLE `t1` (
    `a` int(11) DEFAULT NULL,
    `b` char(8) DEFAULT NULL
--) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 DATA DIRECTORY='<DATA_DIR>' INDEX DIRECTORY='<INDEX_DIR>'
+-) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 DATA DIRECTORY='<DATA_DIR_1>'
 +) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`)
  DROP TABLE t1;

storage/myisammrg/mysql-test/storage_engine/tbl_opt_index_dir.rdiff

+--- suite/storage_engine/tbl_opt_index_dir.result	2017-05-24 00:21:15.550159778 +0300
++++ ../storage/myisammrg/mysql-test/storage_engine/tbl_opt_index_dir.reject	2017-05-24 00:25:45.506164827 +0300
+@@ -5,7 +5,7 @@
+ t1	CREATE TABLE `t1` (
+   `a` int(11) DEFAULT NULL,
+   `b` char(8) DEFAULT NULL
+-) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 INDEX DIRECTORY='<INDEX_DIR_1>'
++) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`)
+ # For ALTER TABLE the option is ignored
+ # Running ALTER TABLE .. INDEX DIRECTORY = <>
+ Warnings:
+@@ -15,5 +15,5 @@
+ t1	CREATE TABLE `t1` (
+   `a` int(11) DEFAULT NULL,
+   `b` char(8) DEFAULT NULL
+-) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 INDEX DIRECTORY='<INDEX_DIR_1>'
++) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 INSERT_METHOD=LAST UNION=(`mrg`.`t1`)
+ DROP TABLE t1;

storage/myisammrg/mysql-test/storage_engine/tbl_opt_row_format.rdiff

---- tbl_opt_row_format.result	2013-01-22 22:05:05.246633000 +0400
-+++ tbl_opt_row_format.reject	2013-01-23 02:51:04.743438518 +0400
-@@ -5,12 +5,12 @@
+--- ../storage/myisammrg/mysql-test/storage_engine/tbl_opt_row_format.result~	2017-05-24 00:50:44.254192857 +0300
++++ ../storage/myisammrg/mysql-test/storage_engine/tbl_opt_row_format.reject	2017-05-24 00:50:44.334192859 +0300
+@@ -5,26 +5,26 @@
+ t1	CREATE TABLE `t1` (
+   `a` int(11) DEFAULT NULL,
+   `b` char(8) DEFAULT NULL
+-) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
++) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC INSERT_METHOD=LAST UNION=(`mrg`.`t1`)
+ ALTER TABLE t1 ROW_FORMAT=FIXED;
+ SHOW CREATE TABLE t1;
+ Table	Create Table
  t1	CREATE TABLE `t1` (
    `a` int(11) DEFAULT NULL,
    `b` char(8) DEFAULT NULL
 -) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED
 +) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 ROW_FORMAT=FIXED INSERT_METHOD=LAST UNION=(`mrg`.`t1`)
- ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
+ ALTER TABLE t1 ROW_FORMAT=PAGE;
  SHOW CREATE TABLE t1;
  Table	Create Table
  t1	CREATE TABLE `t1` (
    `a` int(11) DEFAULT NULL,
    `b` char(8) DEFAULT NULL
--) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
-+) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC INSERT_METHOD=LAST UNION=(`mrg`.`t1`)
+-) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 ROW_FORMAT=PAGE
++) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 ROW_FORMAT=PAGE INSERT_METHOD=LAST UNION=(`mrg`.`t1`)
+ ALTER TABLE t1 ROW_FORMAT=COMPACT;
+ SHOW CREATE TABLE t1;
+ Table	Create Table
+ t1	CREATE TABLE `t1` (
+   `a` int(11) DEFAULT NULL,
+   `b` char(8) DEFAULT NULL
+-) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT
++) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 ROW_FORMAT=COMPACT INSERT_METHOD=LAST UNION=(`mrg`.`t1`)
  DROP TABLE t1;

storage/myisammrg/mysql-test/storage_engine/vcol.rdiff

@@ -6,12 +6,12 @@
 -SHOW COLUMNS IN t1;
 -Field	Type	Null	Key	Default	Extra
 -a	int(11)	#		#	
--b	int(11)	#		#	VIRTUAL
+-b	int(11)	#		#	VIRTUAL GENERATED
 -INSERT INTO t1 (a) VALUES (1),(2);
 -INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
 -Warnings:
--Warning	1906	The value specified for computed column 'b' in table 't1' ignored
--Warning	1906	The value specified for computed column 'b' in table 't1' ignored
+-Warning	1906	The value specified for generated column 'b' in table 't1' ignored
+-Warning	1906	The value specified for generated column 'b' in table 't1' ignored
 -SELECT a,b FROM t1;
 -a	b
 -1	2
@@ -23,12 +23,12 @@
 -SHOW COLUMNS IN t1;
 -Field	Type	Null	Key	Default	Extra
 -a	int(11)	#		#	
--b	int(11)	#		#	PERSISTENT
+-b	int(11)	#		#	STORED GENERATED
 -INSERT INTO t1 (a) VALUES (1),(2);
 -INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
 -Warnings:
--Warning	1906	The value specified for computed column 'b' in table 't1' ignored
--Warning	1906	The value specified for computed column 'b' in table 't1' ignored
+-Warning	1906	The value specified for generated column 'b' in table 't1' ignored
+-Warning	1906	The value specified for generated column 'b' in table 't1' ignored
 -SELECT a,b FROM t1;
 -a	b
 -1	2
@@ -40,12 +40,12 @@
 -SHOW COLUMNS IN t1;
 -Field	Type	Null	Key	Default	Extra
 -a	int(11)	#		#	
--b	int(11)	#		#	VIRTUAL
+-b	int(11)	#		#	VIRTUAL GENERATED
 -INSERT INTO t1 (a) VALUES (1),(2);
 -INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
 -Warnings:
--Warning	1906	The value specified for computed column 'b' in table 't1' ignored
--Warning	1906	The value specified for computed column 'b' in table 't1' ignored
+-Warning	1906	The value specified for generated column 'b' in table 't1' ignored
+-Warning	1906	The value specified for generated column 'b' in table 't1' ignored
 -SELECT a,b FROM t1;
 -a	b
 -1	2
@@ -57,12 +57,12 @@
 -SHOW COLUMNS IN t1;
 -Field	Type	Null	Key	Default	Extra
 -a	int(11)	#		#	
--b	int(11)	#		#	PERSISTENT
+-b	int(11)	#		#	STORED GENERATED
 -INSERT INTO t1 (a) VALUES (1),(2);
 -INSERT INTO t1 (a,b) VALUES (3,3),(4,4);
 -Warnings:
--Warning	1906	The value specified for computed column 'b' in table 't1' ignored
--Warning	1906	The value specified for computed column 'b' in table 't1' ignored
+-Warning	1906	The value specified for generated column 'b' in table 't1' ignored
+-Warning	1906	The value specified for generated column 'b' in table 't1' ignored
 -SELECT a,b FROM t1;
 -a	b
 -1	2
@@ -70,11 +70,11 @@
 -3	4
 -4	5
 -DROP TABLE t1;
-+ERROR HY000: MRG_MyISAM storage engine does not support computed columns
-+# ERROR: Statement ended with errno 1910, errname ER_UNSUPPORTED_ENGINE_FOR_VIRTUAL_COLUMNS (expected to succeed)
++ERROR HY000: MRG_MyISAM storage engine does not support generated columns
++# ERROR: Statement ended with errno 1910, errname ER_UNSUPPORTED_ENGINE_FOR_GENERATED_COLUMNS (expected to succeed)
 +# ------------ UNEXPECTED RESULT ------------
 +# [ CREATE TABLE t1 (a INT(11) /*!*/ /*Custom column options*/, b INT(11) /*!*/ /*Custom column options*/ GENERATED ALWAYS AS (a+1)) ENGINE=MRG_MYISAM /*!*/ /*Custom table options*/ UNION(mrg.t1) INSERT_METHOD=LAST ]
-+# The statement|command finished with ER_UNSUPPORTED_ENGINE_FOR_VIRTUAL_COLUMNS.
++# The statement|command finished with ER_UNSUPPORTED_ENGINE_FOR_GENERATED_COLUMNS.
 +# Virtual columns or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. 
 +# You can change the engine code, or create an rdiff, or disable the test by adding it to disabled.def.
 +# Further in this test, the message might sometimes be suppressed; a part of the test might be skipped.

storage/xtradb/mysql-test/storage_engine/suite.pm

+package My::Suite::SE::XtraDB;
+
+@ISA = qw(My::Suite);
+
+return "Need XtraDB engine";
+
+bless { };
+