mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Adjust storage_engine suite according to server changes in 10.2

Browse source
This commit is contained in:
Elena Stepanova 2017-06-03 02:47:52 +03:00
commit 36e020a5d6
35 changed files with 338 additions and 840 deletions
Download patch file Download diff file Expand all files Collapse all files

2
storage/myisammrg/mysql-test/storage_engine/alter_tablespace.rdiff
View file

@ -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

2
storage/myisammrg/mysql-test/storage_engine/create_table.rdiff
View file

@ -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

3
storage/myisammrg/mysql-test/storage_engine/disabled.def Normal file
View file

@ -0,0 +1,3 @@
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

7
storage/myisammrg/mysql-test/storage_engine/parts/repair_table.rdiff
View file

@ -1,6 +1,6 @@
--- 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)

8
storage/myisammrg/mysql-test/storage_engine/repair_table.rdiff
View file

@ -1,5 +1,5 @@
--- 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');

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

@ -1,18 +1,18 @@
--- 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;

18
storage/myisammrg/mysql-test/storage_engine/tbl_opt_index_dir.rdiff Normal file
View file

@ -0,0 +1,18 @@
--- 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;

38
storage/myisammrg/mysql-test/storage_engine/tbl_opt_row_format.rdiff
View file

@ -1,17 +1,33 @@
--- 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 @@
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;
SHOW CREATE TABLE t1;
Table Create Table
--- ../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=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=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;

30
storage/myisammrg/mysql-test/storage_engine/vcol.rdiff
View file

@ -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.