mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Follow up for 9a84980668 - adjustments to storage_engine tests
This commit is contained in:
Elena Stepanova
@ -101,6 +101,7 @@ INSERT INTO t1 (a,b) VALUES (10,'j');
|
|||||||
REPAIR TABLE t1 USE_FRM;
|
REPAIR TABLE t1 USE_FRM;
|
||||||
Table Op Msg_type Msg_text
|
Table Op Msg_type Msg_text
|
||||||
test.t1 repair status OK
|
test.t1 repair status OK
|
||||||
|
db.opt
|
||||||
t1#P#p0.MYD
|
t1#P#p0.MYD
|
||||||
t1#P#p0.MYI
|
t1#P#p0.MYI
|
||||||
t1#P#p1.MYD
|
t1#P#p1.MYD
|
||||||
|
|||||||
@ -73,6 +73,7 @@ REPAIR TABLE t1 USE_FRM;
|
|||||||
Table Op Msg_type Msg_text
|
Table Op Msg_type Msg_text
|
||||||
test.t1 repair warning Number of rows changed from 0 to 3
|
test.t1 repair warning Number of rows changed from 0 to 3
|
||||||
test.t1 repair status OK
|
test.t1 repair status OK
|
||||||
|
db.opt
|
||||||
t1.MYD
|
t1.MYD
|
||||||
t1.MYI
|
t1.MYI
|
||||||
t1.frm
|
t1.frm
|
||||||
|
|||||||
@ -78,7 +78,7 @@
|
|||||||
DROP TABLE t1, t2;
|
DROP TABLE t1, t2;
|
||||||
call mtr.add_suppression("Got an error from thread_id=.*");
|
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("MySQL thread id .*, query id .* localhost.*root Checking table");
|
||||||
@@ -62,45 +63,32 @@
|
@@ -63,46 +64,33 @@
|
||||||
CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>, <CUSTOM_INDEX> (a)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
|
CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>, <CUSTOM_INDEX> (a)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
|
||||||
REPAIR TABLE t1;
|
REPAIR TABLE t1;
|
||||||
Table Op Msg_type Msg_text
|
Table Op Msg_type Msg_text
|
||||||
@ -94,9 +94,10 @@
|
|||||||
Table Op Msg_type Msg_text
|
Table Op Msg_type Msg_text
|
||||||
-test.t1 repair warning Number of rows changed from 0 to 3
|
-test.t1 repair warning Number of rows changed from 0 to 3
|
||||||
-test.t1 repair status OK
|
-test.t1 repair status OK
|
||||||
|
+test.t1 repair note The storage engine for the table doesn't support repair
|
||||||
|
db.opt
|
||||||
-t1.MYD
|
-t1.MYD
|
||||||
-t1.MYI
|
-t1.MYI
|
||||||
+test.t1 repair note The storage engine for the table doesn't support repair
|
|
||||||
t1.frm
|
t1.frm
|
||||||
+t1.ibd
|
+t1.ibd
|
||||||
INSERT INTO t1 (a,b) VALUES (14,'n'),(15,'o');
|
INSERT INTO t1 (a,b) VALUES (14,'n'),(15,'o');
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
--- suite/storage_engine/parts/repair_table.result 2017-08-28 19:29:20.491633306 +0300
|
--- suite/storage_engine/parts/repair_table.result 2017-08-28 19:29:20.491633306 +0300
|
||||||
+++ suite/storage_engine/parts/repair_table.reject 2017-08-28 19:34:41.723633059 +0300
|
+++ suite/storage_engine/parts/repair_table.reject 2017-08-28 19:34:41.723633059 +0300
|
||||||
@@ -1,235 +1,115 @@
|
@@ -1,236 +1,116 @@
|
||||||
call mtr.add_suppression("Table '.*t1.*' is marked as crashed and should be repaired");
|
call mtr.add_suppression("Table '.*t1.*' is marked as crashed and should be repaired");
|
||||||
DROP TABLE IF EXISTS t1, t2;
|
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;
|
CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS> PARTITION BY HASH(a) PARTITIONS 2;
|
||||||
@ -165,6 +165,9 @@
|
|||||||
REPAIR TABLE t1 USE_FRM;
|
REPAIR TABLE t1 USE_FRM;
|
||||||
Table Op Msg_type Msg_text
|
Table Op Msg_type Msg_text
|
||||||
-test.t1 repair status OK
|
-test.t1 repair status OK
|
||||||
|
+test.t1 repair Error Table 'test.t1' doesn't exist
|
||||||
|
+test.t1 repair status Operation failed
|
||||||
|
db.opt
|
||||||
-t1#P#p0.MYD
|
-t1#P#p0.MYD
|
||||||
-t1#P#p0.MYI
|
-t1#P#p0.MYI
|
||||||
-t1#P#p1.MYD
|
-t1#P#p1.MYD
|
||||||
@ -296,7 +299,5 @@
|
|||||||
-15 o
|
-15 o
|
||||||
-# Statement ended with one of expected results (0,ER_NOT_KEYFILE,144).
|
-# 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
|
-# If you got a difference in error message, just add it to rdiff file
|
||||||
+test.t1 repair Error Table 'test.t1' doesn't exist
|
|
||||||
+test.t1 repair status Operation failed
|
|
||||||
DROP TABLE t1;
|
DROP TABLE t1;
|
||||||
+ERROR 42S02: Unknown table 'test.t1'
|
+ERROR 42S02: Unknown table 'test.t1'
|
||||||
|
|||||||
@ -71,7 +71,7 @@
|
|||||||
DROP TABLE t1, t2;
|
DROP TABLE t1, t2;
|
||||||
call mtr.add_suppression("Got an error from thread_id=.*");
|
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("MySQL thread id .*, query id .* localhost.*root Checking table");
|
||||||
@@ -63,45 +57,32 @@
|
@@ -63,46 +57,33 @@
|
||||||
CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>, <CUSTOM_INDEX> (a)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
|
CREATE TABLE t1 (a <INT_COLUMN>, b <CHAR_COLUMN>, <CUSTOM_INDEX> (a)) ENGINE=<STORAGE_ENGINE> <CUSTOM_TABLE_OPTIONS>;
|
||||||
REPAIR TABLE t1;
|
REPAIR TABLE t1;
|
||||||
Table Op Msg_type Msg_text
|
Table Op Msg_type Msg_text
|
||||||
@ -87,9 +87,10 @@
|
|||||||
Table Op Msg_type Msg_text
|
Table Op Msg_type Msg_text
|
||||||
-test.t1 repair warning Number of rows changed from 0 to 3
|
-test.t1 repair warning Number of rows changed from 0 to 3
|
||||||
-test.t1 repair status OK
|
-test.t1 repair status OK
|
||||||
|
+test.t1 repair note The storage engine for the table doesn't support repair
|
||||||
|
db.opt
|
||||||
-t1.MYD
|
-t1.MYD
|
||||||
-t1.MYI
|
-t1.MYI
|
||||||
+test.t1 repair note The storage engine for the table doesn't support repair
|
|
||||||
+t1.MRG
|
+t1.MRG
|
||||||
t1.frm
|
t1.frm
|
||||||
INSERT INTO t1 (a,b) VALUES (14,'n'),(15,'o');
|
INSERT INTO t1 (a,b) VALUES (14,'n'),(15,'o');
|
||||||
|
|||||||
@ -1,20 +0,0 @@
|
|||||||
--- /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/type_enum.result 2017-06-22 00:33:46.423995639 +0300
|
|
||||||
+++ /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/type_enum.reject 2017-06-22 02:55:49.599942066 +0300
|
|
||||||
@@ -24,8 +24,6 @@
|
|
||||||
test2 4
|
|
||||||
test5 2
|
|
||||||
ALTER TABLE t1 ADD COLUMN e ENUM('a','A') <CUSTOM_COL_OPTIONS>;
|
|
||||||
-Warnings:
|
|
||||||
-Note 1291 Column 'e' has duplicated value 'a' in ENUM
|
|
||||||
SHOW COLUMNS IN t1;
|
|
||||||
Field Type Null Key Default Extra
|
|
||||||
a enum('') # # #
|
|
||||||
@@ -37,7 +35,7 @@
|
|
||||||
a b c e
|
|
||||||
NULL
|
|
||||||
test2 4 NULL
|
|
||||||
- test3 75 a
|
|
||||||
+ test3 75 A
|
|
||||||
test5 2 NULL
|
|
||||||
SELECT a,b,c,e FROM t1 WHERE b='test2' OR a != '';
|
|
||||||
a b c e
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/type_set.result 2017-06-22 00:33:46.423995639 +0300
|
|
||||||
+++ /data/src/bb-10.2-mdev12528/mysql-test/suite/storage_engine/type_set.reject 2017-06-22 03:02:58.695939369 +0300
|
|
||||||
@@ -30,8 +30,6 @@
|
|
||||||
test2,test3 01,23,34,44
|
|
||||||
test2,test4
|
|
||||||
ALTER TABLE t1 ADD COLUMN e SET('a','A') <CUSTOM_COL_OPTIONS>;
|
|
||||||
-Warnings:
|
|
||||||
-Note 1291 Column 'e' has duplicated value 'a' in SET
|
|
||||||
SHOW COLUMNS IN t1;
|
|
||||||
Field Type Null Key Default Extra
|
|
||||||
a set('') # # #
|
|
||||||
Reference in New Issue
Block a user