database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Follow-up for be6ae0bb6b - fix test results

Browse Source 
Duplicate warnings have been removed
This commit is contained in:
Elena Stepanova
2018-05-19 14:23:06 +03:00
parent 36779e624d
commit e4e0aea644
4 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/storage_engine/parts/repair_table.result
View File

@@ -126,7 +126,6 @@ a b
15 o 15 o
Warnings: Warnings:
Error 145 Table './test/t1#P#p0' is marked as crashed and should be repaired 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 Error 1034 Number of rows changed from 3 to 2
# 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
@@ -152,7 +151,6 @@ a b
15 o 15 o
Warnings: Warnings:
Error 145 Table './test/t1#P#p0' is marked as crashed and should be repaired 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 Error 1034 Number of rows changed from 2 to 3
# 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
@@ -177,7 +175,6 @@ a b
15 o 15 o
Warnings: Warnings:
Error 145 Table './test/t1#P#p1' is marked as crashed and should be repaired 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 Error 1034 Number of rows changed from 4 to 3
# 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
@@ -206,7 +203,6 @@ a b
15 o 15 o
Warnings: Warnings:
Error 145 Table './test/t1#P#p1' is marked as crashed and should be repaired 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 Error 1034 Number of rows changed from 3 to 4
# 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

3
storage/myisam/mysql-test/storage_engine/trx/xa_recovery.rdiff
View File

@@ -10,7 +10,7 @@
call mtr.add_suppression("Found 2 prepared XA transactions"); call mtr.add_suppression("Found 2 prepared XA transactions");
FLUSH TABLES; FLUSH TABLES;
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
@@ -18,12 +24,18 @@ @@ -18,12 +24,17 @@
connection default; connection default;
XA RECOVER; XA RECOVER;
formatID gtrid_length bqual_length data formatID gtrid_length bqual_length data
@@ -28,6 +28,5 @@
4 4
+Warnings: +Warnings:
+Error 145 Table './test/t1' is marked as crashed and should be repaired +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 +Error 1034 1 client is using or hasn't closed the table properly
DROP TABLE t1; DROP TABLE t1;

6
storage/myisammrg/mysql-test/storage_engine/parts/repair_table.rdiff
View File

@@ -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,236 +1,116 @@ @@ -1,232 +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;
@@ -192,7 +192,6 @@
-15 o -15 o
-Warnings: -Warnings:
-Error 145 Table './test/t1#P#p0' is marked as crashed and should be repaired -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 -Error 1034 Number of rows changed from 3 to 2
-# 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
@@ -218,7 +217,6 @@
-15 o -15 o
-Warnings: -Warnings:
-Error 145 Table './test/t1#P#p0' is marked as crashed and should be repaired -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 -Error 1034 Number of rows changed from 2 to 3
-# 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
@@ -243,7 +241,6 @@
-15 o -15 o
-Warnings: -Warnings:
-Error 145 Table './test/t1#P#p1' is marked as crashed and should be repaired -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 -Error 1034 Number of rows changed from 4 to 3
-# 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
@@ -272,7 +269,6 @@
-15 o -15 o
-Warnings: -Warnings:
-Error 145 Table './test/t1#P#p1' is marked as crashed and should be repaired -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 -Error 1034 Number of rows changed from 3 to 4
-# 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

3
storage/myisammrg/mysql-test/storage_engine/trx/xa_recovery.rdiff
View File

@@ -10,7 +10,7 @@
call mtr.add_suppression("Found 2 prepared XA transactions"); call mtr.add_suppression("Found 2 prepared XA transactions");
FLUSH TABLES; FLUSH TABLES;
DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t1;
@@ -18,12 +24,18 @@ @@ -18,12 +24,17 @@
connection default; connection default;
XA RECOVER; XA RECOVER;
formatID gtrid_length bqual_length data formatID gtrid_length bqual_length data
@@ -28,6 +28,5 @@
4 4
+Warnings: +Warnings:
+Error 145 Table './mrg/t1' is marked as crashed and should be repaired +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 +Error 1034 1 client is using or hasn't closed the table properly
DROP TABLE t1; DROP TABLE t1;