Various changes coming from 5.6
This commit is contained in:
Elena Stepanova
parent
54b443b9aa
commit
ae62e19f27
@ -24,14 +24,14 @@ INSERT INTO t1 (a,b) VALUES (1,'a'),(2,'b');
|
||||
CREATE TABLE t2 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> CHECKSUM=1 PARTITION BY HASH(a) PARTITIONS 2;
|
||||
CHECKSUM TABLE t1;
|
||||
Table Checksum
|
||||
test.t1 0
|
||||
test.t1 4272806499
|
||||
CHECKSUM TABLE t2, t1;
|
||||
Table Checksum
|
||||
test.t2 0
|
||||
test.t1 0
|
||||
test.t1 4272806499
|
||||
CHECKSUM TABLE t1, t2 QUICK;
|
||||
Table Checksum
|
||||
test.t1 0
|
||||
test.t1 4272806499
|
||||
test.t2 0
|
||||
CHECKSUM TABLE t1, t2 EXTENDED;
|
||||
Table Checksum
|
||||
|
||||
@ -1,19 +1,10 @@
|
||||
--- suite/storage_engine/parts/checksum_table.result 2012-07-12 21:41:00.754458011 +0400
|
||||
+++ suite/storage_engine/parts/checksum_table.reject 2012-07-15 20:04:35.881962676 +0400
|
||||
@@ -24,15 +24,15 @@
|
||||
CREATE TABLE t2 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> CHECKSUM=1 PARTITION BY HASH(a) PARTITIONS 2;
|
||||
CHECKSUM TABLE t1;
|
||||
Table Checksum
|
||||
-test.t1 0
|
||||
+test.t1 4272806499
|
||||
CHECKSUM TABLE t2, t1;
|
||||
Table Checksum
|
||||
test.t2 0
|
||||
-test.t1 0
|
||||
+test.t1 4272806499
|
||||
--- suite/storage_engine/parts/checksum_table.result 2013-11-08 22:30:34.000000000 +0400
|
||||
+++ suite/storage_engine/parts/checksum_table.reject 2013-11-08 22:32:30.000000000 +0400
|
||||
@@ -31,8 +31,8 @@
|
||||
test.t1 4272806499
|
||||
CHECKSUM TABLE t1, t2 QUICK;
|
||||
Table Checksum
|
||||
-test.t1 0
|
||||
-test.t1 4272806499
|
||||
-test.t2 0
|
||||
+test.t1 NULL
|
||||
+test.t2 NULL
|
||||
|
||||
@ -0,0 +1 @@
|
||||
repair_table : InnoDB of 5.6.10 does not support repair on partitioned tables (fixed by 5.6.14)
|
||||
@ -1,5 +1,5 @@
|
||||
--- suite/storage_engine/repair_table.result 2012-07-15 01:26:44.347708000 +0400
|
||||
+++ suite/storage_engine/repair_table.reject 2012-07-15 17:50:37.927013454 +0400
|
||||
--- suite/storage_engine/repair_table.result 2013-10-03 20:35:06.000000000 +0400
|
||||
+++ suite/storage_engine/repair_table.reject 2013-11-08 22:04:22.000000000 +0400
|
||||
@@ -4,56 +4,57 @@
|
||||
CREATE TABLE t2 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
|
||||
REPAIR TABLE t1;
|
||||
@ -78,7 +78,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 +63,14 @@
|
||||
@@ -62,45 +63,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
|
||||
@ -98,16 +98,19 @@
|
||||
-t1.MYI
|
||||
+test.t1 repair note The storage engine for the table doesn't support repair
|
||||
t1.frm
|
||||
-INSERT INTO t1 (a,b) VALUES (14,'n'),(15,'o');
|
||||
-# Statement ended with one of expected results (0,144).
|
||||
-# If you got a difference in error message, just add it to rdiff file
|
||||
-FLUSH TABLE t1;
|
||||
+t1.ibd
|
||||
INSERT INTO t1 (a,b) VALUES (14,'n'),(15,'o');
|
||||
# Statement ended with one of expected results (0,144).
|
||||
# If you got a difference in error message, just add it to rdiff file
|
||||
FLUSH TABLE t1;
|
||||
-Restoring <DATADIR>/test/t1.MYD
|
||||
-CHECK TABLE t1;
|
||||
-Table Op Msg_type Msg_text
|
||||
+Restoring <DATADIR>/test/t1.ibd
|
||||
CHECK TABLE t1;
|
||||
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;
|
||||
+test.t1 check status OK
|
||||
SELECT a,b FROM t1;
|
||||
-ERROR HY000: Incorrect key file for table 't1'; 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
|
||||
@ -124,6 +127,12 @@
|
||||
-test.t1 check error Corrupt
|
||||
-SELECT a,b FROM t1;
|
||||
-ERROR HY000: Table './test/t1' is marked as crashed and last (automatic?) repair failed
|
||||
-# 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
|
||||
+a b
|
||||
+7 g
|
||||
+8 h
|
||||
+10 j
|
||||
+14 n
|
||||
+15 o
|
||||
# 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
|
||||
DROP TABLE t1;
|
||||
|
||||
@ -1,18 +1,23 @@
|
||||
--- suite/storage_engine/tbl_opt_data_index_dir.result 2012-06-24 23:55:19.539380000 +0400
|
||||
+++ suite/storage_engine/tbl_opt_data_index_dir.reject 2012-07-15 17:51:04.070684784 +0400
|
||||
@@ -4,7 +4,7 @@
|
||||
--- suite/storage_engine/tbl_opt_data_index_dir.result 2013-10-03 20:35:06.000000000 +0400
|
||||
+++ suite/storage_engine/tbl_opt_data_index_dir.reject 2013-11-08 22:06:54.000000000 +0400
|
||||
@@ -1,10 +1,12 @@
|
||||
DROP TABLE IF EXISTS t1;
|
||||
+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 DATA DIRECTORY='<DATA_DIR>' INDEX DIRECTORY='<INDEX_DIR>'
|
||||
+) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1
|
||||
+) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 DATA DIRECTORY='<DATA_DIR>'
|
||||
Warnings:
|
||||
Warning 1618 <INDEX DIRECTORY> option ignored
|
||||
SHOW CREATE TABLE t1;
|
||||
@@ -12,5 +12,5 @@
|
||||
@@ -12,5 +14,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
|
||||
+) ENGINE=<STORAGE_ENGINE> DEFAULT CHARSET=latin1 DATA DIRECTORY='<DATA_DIR>'
|
||||
DROP TABLE t1;
|
||||
|
||||
@ -1,14 +1,5 @@
|
||||
--- suite/storage_engine/type_char_indexes.result 2012-07-12 19:27:42.191013570 +0400
|
||||
+++ suite/storage_engine/type_char_indexes.reject 2012-07-15 17:51:55.810034331 +0400
|
||||
@@ -98,7 +98,7 @@
|
||||
SET SESSION optimizer_switch = 'engine_condition_pushdown=on';
|
||||
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
|
||||
+# # # range c_v c_v # # # Using where
|
||||
SELECT c,c20,v16,v128 FROM t1 WHERE c > 'a';
|
||||
c c20 v16 v128
|
||||
b char3 varchar1a varchar1b
|
||||
@@ -135,7 +135,7 @@
|
||||
r3a
|
||||
EXPLAIN SELECT c,c20,v16,v128 FROM t1 WHERE v16 = 'varchar1a' OR v16 = 'varchar3a' ORDER BY v16;
|
||||
|
||||
@ -54,14 +54,14 @@
|
||||
+# ERROR: Statement ended with errno 1572, errname ER_PARTITION_MERGE_ERROR (expected to succeed)
|
||||
CHECKSUM TABLE t1;
|
||||
Table Checksum
|
||||
-test.t1 0
|
||||
-test.t1 4272806499
|
||||
+test.t1 NULL
|
||||
+Warnings:
|
||||
+Error 1146 Table 'test.t1' doesn't exist
|
||||
CHECKSUM TABLE t2, t1;
|
||||
Table Checksum
|
||||
-test.t2 0
|
||||
-test.t1 0
|
||||
-test.t1 4272806499
|
||||
+test.t2 NULL
|
||||
+test.t1 NULL
|
||||
+Warnings:
|
||||
@ -69,7 +69,7 @@
|
||||
+Error 1146 Table 'test.t1' doesn't exist
|
||||
CHECKSUM TABLE t1, t2 QUICK;
|
||||
Table Checksum
|
||||
-test.t1 0
|
||||
-test.t1 4272806499
|
||||
-test.t2 0
|
||||
+test.t1 NULL
|
||||
+test.t2 NULL
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user