diff options
4 files changed, 3 insertions, 13 deletions
diff --git a/mysql-test/suite/storage_engine/parts/repair_table.result b/mysql-test/suite/storage_engine/parts/repair_table.result index ca0d9d10087..63131250a01 100644 --- a/mysql-test/suite/storage_engine/parts/repair_table.result +++ b/mysql-test/suite/storage_engine/parts/repair_table.result @@ -126,7 +126,6 @@ a b 15 o Warnings: Error 145 Table './test/t1#P#p0' is marked as crashed and should be repaired -Error 1194 Table 't1' is marked as crashed and should be repaired Error 1034 Number of rows changed from 3 to 2 # 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 @@ -152,7 +151,6 @@ a b 15 o Warnings: Error 145 Table './test/t1#P#p0' is marked as crashed and should be repaired -Error 1194 Table 't1' is marked as crashed and should be repaired Error 1034 Number of rows changed from 2 to 3 # 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 @@ -177,7 +175,6 @@ a b 15 o Warnings: Error 145 Table './test/t1#P#p1' is marked as crashed and should be repaired -Error 1194 Table 't1' is marked as crashed and should be repaired Error 1034 Number of rows changed from 4 to 3 # 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 @@ -206,7 +203,6 @@ a b 15 o Warnings: Error 145 Table './test/t1#P#p1' is marked as crashed and should be repaired -Error 1194 Table 't1' is marked as crashed and should be repaired Error 1034 Number of rows changed from 3 to 4 # 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 diff --git a/storage/myisam/mysql-test/storage_engine/trx/xa_recovery.rdiff b/storage/myisam/mysql-test/storage_engine/trx/xa_recovery.rdiff index e637643d59d..4b057019bbd 100644 --- a/storage/myisam/mysql-test/storage_engine/trx/xa_recovery.rdiff +++ b/storage/myisam/mysql-test/storage_engine/trx/xa_recovery.rdiff @@ -10,7 +10,7 @@ call mtr.add_suppression("Found 2 prepared XA transactions"); FLUSH TABLES; DROP TABLE IF EXISTS t1; -@@ -18,12 +24,18 @@ +@@ -18,12 +24,17 @@ connection default; XA RECOVER; formatID gtrid_length bqual_length data @@ -28,6 +28,5 @@ 4 +Warnings: +Error 145 Table './test/t1' is marked as crashed and should be repaired -+Error 1194 Table 't1' is marked as crashed and should be repaired +Error 1034 1 client is using or hasn't closed the table properly DROP TABLE t1; diff --git a/storage/myisammrg/mysql-test/storage_engine/parts/repair_table.rdiff b/storage/myisammrg/mysql-test/storage_engine/parts/repair_table.rdiff index 17fd0f124eb..eddb6872ec3 100644 --- a/storage/myisammrg/mysql-test/storage_engine/parts/repair_table.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/parts/repair_table.rdiff @@ -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.reject 2017-08-28 19:34:41.723633059 +0300 -@@ -1,236 +1,116 @@ +@@ -1,232 +1,116 @@ 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; @@ -192,7 +192,6 @@ -15 o -Warnings: -Error 145 Table './test/t1#P#p0' is marked as crashed and should be repaired --Error 1194 Table 't1' is marked as crashed and should be repaired -Error 1034 Number of rows changed from 3 to 2 -# 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 @@ -218,7 +217,6 @@ -15 o -Warnings: -Error 145 Table './test/t1#P#p0' is marked as crashed and should be repaired --Error 1194 Table 't1' is marked as crashed and should be repaired -Error 1034 Number of rows changed from 2 to 3 -# 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 @@ -243,7 +241,6 @@ -15 o -Warnings: -Error 145 Table './test/t1#P#p1' is marked as crashed and should be repaired --Error 1194 Table 't1' is marked as crashed and should be repaired -Error 1034 Number of rows changed from 4 to 3 -# 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 @@ -272,7 +269,6 @@ -15 o -Warnings: -Error 145 Table './test/t1#P#p1' is marked as crashed and should be repaired --Error 1194 Table 't1' is marked as crashed and should be repaired -Error 1034 Number of rows changed from 3 to 4 -# 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 diff --git a/storage/myisammrg/mysql-test/storage_engine/trx/xa_recovery.rdiff b/storage/myisammrg/mysql-test/storage_engine/trx/xa_recovery.rdiff index 8dc888a1d58..fa920abefc8 100644 --- a/storage/myisammrg/mysql-test/storage_engine/trx/xa_recovery.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/trx/xa_recovery.rdiff @@ -10,7 +10,7 @@ call mtr.add_suppression("Found 2 prepared XA transactions"); FLUSH TABLES; DROP TABLE IF EXISTS t1; -@@ -18,12 +24,18 @@ +@@ -18,12 +24,17 @@ connection default; XA RECOVER; formatID gtrid_length bqual_length data @@ -28,6 +28,5 @@ 4 +Warnings: +Error 145 Table './mrg/t1' is marked as crashed and should be repaired -+Error 1194 Table 't1' is marked as crashed and should be repaired +Error 1034 1 client is using or hasn't closed the table properly DROP TABLE t1; |