Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
e4e0aea6
Commit
e4e0aea6
authored
6 years ago
by
Elena Stepanova
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Follow-up for
be6ae0bb
- fix test results
Duplicate warnings have been removed
parent
36779e62
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
13 deletions
+3
-13
mysql-test/suite/storage_engine/parts/repair_table.result
mysql-test/suite/storage_engine/parts/repair_table.result
+0
-4
storage/myisam/mysql-test/storage_engine/trx/xa_recovery.rdiff
...ge/myisam/mysql-test/storage_engine/trx/xa_recovery.rdiff
+1
-2
storage/myisammrg/mysql-test/storage_engine/parts/repair_table.rdiff
...sammrg/mysql-test/storage_engine/parts/repair_table.rdiff
+1
-5
storage/myisammrg/mysql-test/storage_engine/trx/xa_recovery.rdiff
...myisammrg/mysql-test/storage_engine/trx/xa_recovery.rdiff
+1
-2
No files found.
mysql-test/suite/storage_engine/parts/repair_table.result
View file @
e4e0aea6
...
@@ -126,7 +126,6 @@ a b
...
@@ -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
...
@@ -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
...
@@ -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
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
storage/myisam/mysql-test/storage_engine/trx/xa_recovery.rdiff
View file @
e4e0aea6
...
@@ -10,7 +10,7 @@
...
@@ -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,1
8
@@
@@ -18,12 +24,1
7
@@
connection default;
connection default;
XA RECOVER;
XA RECOVER;
formatID gtrid_length bqual_length data
formatID gtrid_length bqual_length data
...
@@ -28,6 +28,5 @@
...
@@ -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;
This diff is collapsed.
Click to expand it.
storage/myisammrg/mysql-test/storage_engine/parts/repair_table.rdiff
View file @
e4e0aea6
--- 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,23
6
+1,116 @@
@@ -1,23
2
+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 @@
...
@@ -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 @@
...
@@ -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 @@
...
@@ -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 @@
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
storage/myisammrg/mysql-test/storage_engine/trx/xa_recovery.rdiff
View file @
e4e0aea6
...
@@ -10,7 +10,7 @@
...
@@ -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,1
8
@@
@@ -18,12 +24,1
7
@@
connection default;
connection default;
XA RECOVER;
XA RECOVER;
formatID gtrid_length bqual_length data
formatID gtrid_length bqual_length data
...
@@ -28,6 +28,5 @@
...
@@ -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;
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment