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
a3319fa5
Commit
a3319fa5
authored
May 25, 2010
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Postfix BUG#49741
parent
e78da462
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
28 deletions
+28
-28
mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
+7
-7
mysql-test/suite/rpl/r/rpl_extraCol_innodb.result
mysql-test/suite/rpl/r/rpl_extraCol_innodb.result
+7
-7
mysql-test/suite/rpl/r/rpl_extraCol_myisam.result
mysql-test/suite/rpl/r/rpl_extraCol_myisam.result
+7
-7
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result
+7
-7
No files found.
mysql-test/extra/rpl_tests/rpl_extraSlave_Col.test
View file @
a3319fa5
...
...
@@ -145,7 +145,7 @@ set @b1 = concat(@b1,@b1);
INSERT
INTO
t3
()
VALUES
(
@
b1
,
2
,
'Kyle, TEX'
),(
@
b1
,
1
,
'JOE AUSTIN'
),(
@
b1
,
4
,
'QA TESTING'
);
--
echo
********************************************
--
echo
***
Expect
slave
to
fail
with
Error
15
22
***
--
echo
***
Expect
slave
to
fail
with
Error
15
35
***
--
echo
********************************************
connection
slave
;
--
let
$slave_sql_errno
=
1535
...
...
@@ -188,7 +188,7 @@ INSERT INTO t4 () VALUES(100.22,2,'Kyle, TEX'),(200.26,1,'JOE AUSTIN'),
(
30000.22
,
4
,
'QA TESTING'
);
--
echo
********************************************
--
echo
***
Expect
slave
to
fail
with
Error
15
22
***
--
echo
***
Expect
slave
to
fail
with
Error
15
35
***
--
echo
********************************************
connection
slave
;
--
let
$slave_sql_errno
=
1535
...
...
@@ -231,7 +231,7 @@ INSERT INTO t5 () VALUES(1,'Kyle',200.23,1,'b1b1',23.00098),
(
2
,
'JOE'
,
300.01
,
0
,
'b2b2'
,
1.0000009
);
--
echo
********************************************
--
echo
***
Expect
slave
to
fail
with
Error
15
22
***
--
echo
***
Expect
slave
to
fail
with
Error
15
35
***
--
echo
********************************************
connection
slave
;
--
let
$slave_sql_errno
=
1535
...
...
@@ -275,7 +275,7 @@ INSERT INTO t6 () VALUES(1,'Kyle',200.23,1),
(
2
,
'JOE'
,
300.01
,
0
);
--
echo
********************************************
--
echo
***
Expect
slave
to
fail
with
Error
15
22
***
--
echo
***
Expect
slave
to
fail
with
Error
15
35
***
--
echo
********************************************
connection
slave
;
--
let
$slave_sql_errno
=
1535
...
...
@@ -479,7 +479,7 @@ set @b1 = concat(@b1,@b1);
INSERT
INTO
t10
()
VALUES
(
1
,
@
b1
,
'Kyle'
),(
2
,
@
b1
,
'JOE'
),(
3
,
@
b1
,
'QA'
);
--
echo
********************************************
--
echo
***
Expect
slave
to
fail
with
Error
15
22
***
--
echo
***
Expect
slave
to
fail
with
Error
15
35
***
--
echo
********************************************
connection
slave
;
--
let
$slave_sql_errno
=
1535
...
...
@@ -521,7 +521,7 @@ set @b1 = concat(@b1,@b1);
INSERT
INTO
t11
()
VALUES
(
1
,
@
b1
,
'Kyle'
),(
2
,
@
b1
,
'JOE'
),(
3
,
@
b1
,
'QA'
);
--
echo
********************************************
--
echo
***
Expect
slave
to
fail
with
Error
15
22
***
--
echo
***
Expect
slave
to
fail
with
Error
15
35
***
--
echo
********************************************
connection
slave
;
--
let
$slave_sql_errno
=
1535
...
...
@@ -900,7 +900,7 @@ connection master;
INSERT
INTO
t17
()
VALUES
(
9223372036854775807
,
2
,
'Kyle, TEX'
);
--
echo
********************************************
--
echo
***
Expect
slave
to
fail
with
Error
15
22
***
--
echo
***
Expect
slave
to
fail
with
Error
15
35
***
--
echo
********************************************
connection
slave
;
--
let
$slave_sql_errno
=
1535
...
...
mysql-test/suite/rpl/r/rpl_extraCol_innodb.result
View file @
a3319fa5
...
...
@@ -81,7 +81,7 @@ set @b1 = 'b1';
set @b1 = concat(@b1,@b1);
INSERT INTO t3 () VALUES(@b1,2,'Kyle, TEX'),(@b1,1,'JOE AUSTIN'),(@b1,4,'QA TESTING');
********************************************
*** Expect slave to fail with Error 15
22
***
*** Expect slave to fail with Error 15
35
***
********************************************
--source include/wait_for_slave_sql_error_and_skip.inc
Last_SQL_Error = Table definition on master and slave does not match: Column 0 type mismatch - received type 252, test.t3 has type 3
...
...
@@ -106,7 +106,7 @@ START SLAVE;
INSERT INTO t4 () VALUES(100.22,2,'Kyle, TEX'),(200.26,1,'JOE AUSTIN'),
(30000.22,4,'QA TESTING');
********************************************
*** Expect slave to fail with Error 15
22
***
*** Expect slave to fail with Error 15
35
***
********************************************
--source include/wait_for_slave_sql_error_and_skip.inc
Last_SQL_Error = Table definition on master and slave does not match: Column 0 type mismatch - received type 246, test.t4 has type 3
...
...
@@ -131,7 +131,7 @@ START SLAVE;
INSERT INTO t5 () VALUES(1,'Kyle',200.23,1,'b1b1',23.00098),
(2,'JOE',300.01,0,'b2b2',1.0000009);
********************************************
*** Expect slave to fail with Error 15
22
***
*** Expect slave to fail with Error 15
35
***
********************************************
--source include/wait_for_slave_sql_error_and_skip.inc
Last_SQL_Error = Table definition on master and slave does not match: Column 5 type mismatch - received type 4, test.t5 has type 246
...
...
@@ -155,7 +155,7 @@ START SLAVE;
INSERT INTO t6 () VALUES(1,'Kyle',200.23,1),
(2,'JOE',300.01,0);
********************************************
*** Expect slave to fail with Error 15
22
***
*** Expect slave to fail with Error 15
35
***
********************************************
Last_SQL_Error = Table definition on master and slave does not match: Column 3 type mismatch - received type 16, test.t6 has type 3
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=3;
...
...
@@ -253,7 +253,7 @@ set @b1 = 'b1b1b1b1';
set @b1 = concat(@b1,@b1);
INSERT INTO t10 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
********************************************
*** Expect slave to fail with Error 15
22
***
*** Expect slave to fail with Error 15
35
***
********************************************
--source include/wait_for_slave_sql_error_and_skip.inc
Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 254, test.t10 has type 5
...
...
@@ -277,7 +277,7 @@ set @b1 = 'b1b1b1b1';
set @b1 = concat(@b1,@b1);
INSERT INTO t11 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
********************************************
*** Expect slave to fail with Error 15
22
***
*** Expect slave to fail with Error 15
35
***
********************************************
--source include/wait_for_slave_sql_error_and_skip.inc
Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 15, test.t11 has type 252
...
...
@@ -593,7 +593,7 @@ START SLAVE;
*** Master Data Insert ***
INSERT INTO t17 () VALUES(9223372036854775807,2,'Kyle, TEX');
********************************************
*** Expect slave to fail with Error 15
22
***
*** Expect slave to fail with Error 15
35
***
********************************************
--source include/wait_for_slave_sql_error_and_skip.inc
Last_SQL_Error = Table definition on master and slave does not match: Column 0 type mismatch - received type 8, test.t17 has type 2
...
...
mysql-test/suite/rpl/r/rpl_extraCol_myisam.result
View file @
a3319fa5
...
...
@@ -81,7 +81,7 @@ set @b1 = 'b1';
set @b1 = concat(@b1,@b1);
INSERT INTO t3 () VALUES(@b1,2,'Kyle, TEX'),(@b1,1,'JOE AUSTIN'),(@b1,4,'QA TESTING');
********************************************
*** Expect slave to fail with Error 15
22
***
*** Expect slave to fail with Error 15
35
***
********************************************
--source include/wait_for_slave_sql_error_and_skip.inc
Last_SQL_Error = Table definition on master and slave does not match: Column 0 type mismatch - received type 252, test.t3 has type 3
...
...
@@ -106,7 +106,7 @@ START SLAVE;
INSERT INTO t4 () VALUES(100.22,2,'Kyle, TEX'),(200.26,1,'JOE AUSTIN'),
(30000.22,4,'QA TESTING');
********************************************
*** Expect slave to fail with Error 15
22
***
*** Expect slave to fail with Error 15
35
***
********************************************
--source include/wait_for_slave_sql_error_and_skip.inc
Last_SQL_Error = Table definition on master and slave does not match: Column 0 type mismatch - received type 246, test.t4 has type 3
...
...
@@ -131,7 +131,7 @@ START SLAVE;
INSERT INTO t5 () VALUES(1,'Kyle',200.23,1,'b1b1',23.00098),
(2,'JOE',300.01,0,'b2b2',1.0000009);
********************************************
*** Expect slave to fail with Error 15
22
***
*** Expect slave to fail with Error 15
35
***
********************************************
--source include/wait_for_slave_sql_error_and_skip.inc
Last_SQL_Error = Table definition on master and slave does not match: Column 5 type mismatch - received type 4, test.t5 has type 246
...
...
@@ -155,7 +155,7 @@ START SLAVE;
INSERT INTO t6 () VALUES(1,'Kyle',200.23,1),
(2,'JOE',300.01,0);
********************************************
*** Expect slave to fail with Error 15
22
***
*** Expect slave to fail with Error 15
35
***
********************************************
Last_SQL_Error = Table definition on master and slave does not match: Column 3 type mismatch - received type 16, test.t6 has type 3
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=3;
...
...
@@ -253,7 +253,7 @@ set @b1 = 'b1b1b1b1';
set @b1 = concat(@b1,@b1);
INSERT INTO t10 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
********************************************
*** Expect slave to fail with Error 15
22
***
*** Expect slave to fail with Error 15
35
***
********************************************
--source include/wait_for_slave_sql_error_and_skip.inc
Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 254, test.t10 has type 5
...
...
@@ -277,7 +277,7 @@ set @b1 = 'b1b1b1b1';
set @b1 = concat(@b1,@b1);
INSERT INTO t11 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
********************************************
*** Expect slave to fail with Error 15
22
***
*** Expect slave to fail with Error 15
35
***
********************************************
--source include/wait_for_slave_sql_error_and_skip.inc
Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 15, test.t11 has type 252
...
...
@@ -593,7 +593,7 @@ START SLAVE;
*** Master Data Insert ***
INSERT INTO t17 () VALUES(9223372036854775807,2,'Kyle, TEX');
********************************************
*** Expect slave to fail with Error 15
22
***
*** Expect slave to fail with Error 15
35
***
********************************************
--source include/wait_for_slave_sql_error_and_skip.inc
Last_SQL_Error = Table definition on master and slave does not match: Column 0 type mismatch - received type 8, test.t17 has type 2
...
...
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result
View file @
a3319fa5
...
...
@@ -81,7 +81,7 @@ set @b1 = 'b1';
set @b1 = concat(@b1,@b1);
INSERT INTO t3 () VALUES(@b1,2,'Kyle, TEX'),(@b1,1,'JOE AUSTIN'),(@b1,4,'QA TESTING');
********************************************
*** Expect slave to fail with Error 15
22
***
*** Expect slave to fail with Error 15
35
***
********************************************
--source include/wait_for_slave_sql_error_and_skip.inc
Last_SQL_Error = Table definition on master and slave does not match: Column 0 type mismatch - received type 252, test.t3 has type 3
...
...
@@ -106,7 +106,7 @@ START SLAVE;
INSERT INTO t4 () VALUES(100.22,2,'Kyle, TEX'),(200.26,1,'JOE AUSTIN'),
(30000.22,4,'QA TESTING');
********************************************
*** Expect slave to fail with Error 15
22
***
*** Expect slave to fail with Error 15
35
***
********************************************
--source include/wait_for_slave_sql_error_and_skip.inc
Last_SQL_Error = Table definition on master and slave does not match: Column 0 type mismatch - received type 246, test.t4 has type 3
...
...
@@ -131,7 +131,7 @@ START SLAVE;
INSERT INTO t5 () VALUES(1,'Kyle',200.23,1,'b1b1',23.00098),
(2,'JOE',300.01,0,'b2b2',1.0000009);
********************************************
*** Expect slave to fail with Error 15
22
***
*** Expect slave to fail with Error 15
35
***
********************************************
--source include/wait_for_slave_sql_error_and_skip.inc
Last_SQL_Error = Table definition on master and slave does not match: Column 5 type mismatch - received type 4, test.t5 has type 246
...
...
@@ -155,7 +155,7 @@ START SLAVE;
INSERT INTO t6 () VALUES(1,'Kyle',200.23,1),
(2,'JOE',300.01,0);
********************************************
*** Expect slave to fail with Error 15
22
***
*** Expect slave to fail with Error 15
35
***
********************************************
Last_SQL_Error = Table definition on master and slave does not match: Column 3 type mismatch - received type 16, test.t6 has type 3
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=3;
...
...
@@ -229,7 +229,7 @@ set @b1 = 'b1b1b1b1';
set @b1 = concat(@b1,@b1);
INSERT INTO t10 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
********************************************
*** Expect slave to fail with Error 15
22
***
*** Expect slave to fail with Error 15
35
***
********************************************
--source include/wait_for_slave_sql_error_and_skip.inc
Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 254, test.t10 has type 5
...
...
@@ -253,7 +253,7 @@ set @b1 = 'b1b1b1b1';
set @b1 = concat(@b1,@b1);
INSERT INTO t11 () VALUES(1,@b1,'Kyle'),(2,@b1,'JOE'),(3,@b1,'QA');
********************************************
*** Expect slave to fail with Error 15
22
***
*** Expect slave to fail with Error 15
35
***
********************************************
--source include/wait_for_slave_sql_error_and_skip.inc
Last_SQL_Error = Table definition on master and slave does not match: Column 2 type mismatch - received type 15, test.t11 has type 252
...
...
@@ -569,7 +569,7 @@ START SLAVE;
*** Master Data Insert ***
INSERT INTO t17 () VALUES(9223372036854775807,2,'Kyle, TEX');
********************************************
*** Expect slave to fail with Error 15
22
***
*** Expect slave to fail with Error 15
35
***
********************************************
--source include/wait_for_slave_sql_error_and_skip.inc
Last_SQL_Error = Table definition on master and slave does not match: Column 0 type mismatch - received type 8, test.t17 has type 2
...
...
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