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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
a93d5306
Commit
a93d5306
authored
Mar 31, 2011
by
Bjorn Munch
Browse files
Options
Browse Files
Download
Plain Diff
Small followup fix after MTR warning cleanup
parents
89d96e3d
997eb49e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
10 deletions
+2
-10
mysql-test/extra/rpl_tests/rpl_extra_col_master.test
mysql-test/extra/rpl_tests/rpl_extra_col_master.test
+2
-0
mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result
mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result
+0
-5
mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result
mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result
+0
-5
No files found.
mysql-test/extra/rpl_tests/rpl_extra_col_master.test
View file @
a93d5306
...
@@ -122,11 +122,13 @@ SELECT f1,f2,f3,f4,f5,f6,f7,f8,f9,
...
@@ -122,11 +122,13 @@ SELECT f1,f2,f3,f4,f5,f6,f7,f8,f9,
#connection slave;
#connection slave;
--
disable_query_log
call
mtr
.
add_suppression
(
"Slave SQL.*Table definition on master and slave does not match: Column 2 type mismatch.* 1535"
);
call
mtr
.
add_suppression
(
"Slave SQL.*Table definition on master and slave does not match: Column 2 type mismatch.* 1535"
);
call
mtr
.
add_suppression
(
"Slave.*Can.t DROP .c7.; check that column.key exists.* Error_code: 1091"
);
call
mtr
.
add_suppression
(
"Slave.*Can.t DROP .c7.; check that column.key exists.* Error_code: 1091"
);
call
mtr
.
add_suppression
(
"Slave.*Unknown column .c7. in .t15.* Error_code: 1054"
);
call
mtr
.
add_suppression
(
"Slave.*Unknown column .c7. in .t15.* Error_code: 1054"
);
call
mtr
.
add_suppression
(
"Slave.*Key column .c6. doesn.t exist in table.* Error_code: 1072"
);
call
mtr
.
add_suppression
(
"Slave.*Key column .c6. doesn.t exist in table.* Error_code: 1072"
);
call
mtr
.
add_suppression
(
"Slave SQL.*Column 2 of table .test.t1.. cannot be converted from type.* Error_code: 1677"
);
call
mtr
.
add_suppression
(
"Slave SQL.*Column 2 of table .test.t1.. cannot be converted from type.* Error_code: 1677"
);
--
enable_query_log
sync_slave_with_master
;
sync_slave_with_master
;
--
echo
--
echo
...
...
mysql-test/suite/rpl/r/rpl_extra_col_master_innodb.result
View file @
a93d5306
...
@@ -57,11 +57,6 @@ f1 f2 f3 f4 f5 f6 f7 f8 f9 hex(f10) hex(f11)
...
@@ -57,11 +57,6 @@ f1 f2 f3 f4 f5 f6 f7 f8 f9 hex(f10) hex(f11)
27 27 27 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456
27 27 27 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456
29 29 29 second 2 kaks 2 got stolen from the paradise very fat blob 1555 123456
29 29 29 second 2 kaks 2 got stolen from the paradise very fat blob 1555 123456
30 30 30 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456
30 30 30 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456
call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 2 type mismatch.* 1535");
call mtr.add_suppression("Slave.*Can.t DROP .c7.; check that column.key exists.* Error_code: 1091");
call mtr.add_suppression("Slave.*Unknown column .c7. in .t15.* Error_code: 1054");
call mtr.add_suppression("Slave.*Key column .c6. doesn.t exist in table.* Error_code: 1072");
call mtr.add_suppression("Slave SQL.*Column 2 of table .test.t1.. cannot be converted from type.* Error_code: 1677");
* Select count and 20 rows from Slave *
* Select count and 20 rows from Slave *
...
...
mysql-test/suite/rpl/r/rpl_extra_col_master_myisam.result
View file @
a93d5306
...
@@ -57,11 +57,6 @@ f1 f2 f3 f4 f5 f6 f7 f8 f9 hex(f10) hex(f11)
...
@@ -57,11 +57,6 @@ f1 f2 f3 f4 f5 f6 f7 f8 f9 hex(f10) hex(f11)
27 27 27 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456
27 27 27 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456
29 29 29 second 2 kaks 2 got stolen from the paradise very fat blob 1555 123456
29 29 29 second 2 kaks 2 got stolen from the paradise very fat blob 1555 123456
30 30 30 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456
30 30 30 next 2 kaks 2 got stolen from the paradise very fat blob 1555 123456
call mtr.add_suppression("Slave SQL.*Table definition on master and slave does not match: Column 2 type mismatch.* 1535");
call mtr.add_suppression("Slave.*Can.t DROP .c7.; check that column.key exists.* Error_code: 1091");
call mtr.add_suppression("Slave.*Unknown column .c7. in .t15.* Error_code: 1054");
call mtr.add_suppression("Slave.*Key column .c6. doesn.t exist in table.* Error_code: 1072");
call mtr.add_suppression("Slave SQL.*Column 2 of table .test.t1.. cannot be converted from type.* Error_code: 1677");
* Select count and 20 rows from Slave *
* Select count and 20 rows from Slave *
...
...
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