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
ef1b1e40
Commit
ef1b1e40
authored
Feb 22, 2006
by
jmiller@mysql.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
parents
0a0aa527
eafd514e
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
16 deletions
+11
-16
mysql-test/r/rpl_row_drop.result
mysql-test/r/rpl_row_drop.result
+0
-6
mysql-test/r/rpl_row_sp010.result
mysql-test/r/rpl_row_sp010.result
+3
-3
mysql-test/t/disabled.def
mysql-test/t/disabled.def
+3
-2
mysql-test/t/rpl_row_drop.test
mysql-test/t/rpl_row_drop.test
+2
-2
mysql-test/t/rpl_row_sp010.test
mysql-test/t/rpl_row_sp010.test
+3
-3
No files found.
mysql-test/r/rpl_row_drop.result
View file @
ef1b1e40
...
@@ -41,12 +41,6 @@ t1
...
@@ -41,12 +41,6 @@ t1
t2
t2
**** On Master ****
**** On Master ****
DROP TABLE t1,t2;
DROP TABLE t1,t2;
SHOW BINLOG EVENTS;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 4 Format_desc 1 102 Server ver: VERSION, Binlog ver: 4
master-bin.000001 102 Query 1 188 use `test`; CREATE TABLE t1 (a int)
master-bin.000001 188 Query 1 274 use `test`; CREATE TABLE t2 (a int)
master-bin.000001 274 Query 1 378 use `test`; DROP TABLE `t1` /* generated by server */
SHOW TABLES;
SHOW TABLES;
Tables_in_test
Tables_in_test
t2
t2
...
...
mysql-test/r/rpl_row_sp010.result
View file @
ef1b1e40
...
@@ -22,7 +22,7 @@ INSERT INTO test.t1 VALUES(1);
...
@@ -22,7 +22,7 @@ INSERT INTO test.t1 VALUES(1);
CALL test.p1();
CALL test.p1();
END|
END|
CALL test.p2();
CALL test.p2();
SELECT * FROM test.t1;
SELECT * FROM test.t1
ORDER BY a
;
a
a
1
1
2
2
...
@@ -40,11 +40,11 @@ INSERT INTO test.t2 VALUES(6);
...
@@ -40,11 +40,11 @@ INSERT INTO test.t2 VALUES(6);
CALL test.p3();
CALL test.p3();
END|
END|
CALL test.p4();
CALL test.p4();
SELECT * FROM test.t2;
SELECT * FROM test.t2
ORDER BY a
;
a
a
6
6
7
7
SELECT * FROM test.t2;
SELECT * FROM test.t2
ORDER BY a
;
a
a
6
6
7
7
...
...
mysql-test/t/disabled.def
View file @
ef1b1e40
...
@@ -24,16 +24,17 @@ rpl_bit_npk : Bug#13418
...
@@ -24,16 +24,17 @@ rpl_bit_npk : Bug#13418
rpl_ddl : Bug#15963 SBR does not show "Definer" correctly
rpl_ddl : Bug#15963 SBR does not show "Definer" correctly
rpl_ndb_auto_inc : Bug#17086
rpl_ndb_auto_inc : Bug#17086
rpl_ndb_basic : Bug#16228 [IN REVIEW]
rpl_ndb_basic : Bug#16228 [IN REVIEW]
rpl_ndb_blob : Bug #17505
rpl_ndb_blob2 : Bug #17505
rpl_ndb_charset : Bug#17246
rpl_ndb_charset : Bug#17246
rpl_ndb_ddl : Bug#17400: delete & update of rows in table without pk fails
rpl_ndb_ddl : Bug#17400: delete & update of rows in table without pk fails
rpl_ndb_delete_nowhere : Bug#17400: delete & update of rows in table without pk fails
rpl_ndb_delete_nowhere : Bug#17400: delete & update of rows in table without pk fails
rpl_ndb_insert_ignore : Bugs: #17431: INSERT IGNORE INTO returns failed: 1296
rpl_ndb_insert_ignore : Bugs: #17431: INSERT IGNORE INTO returns failed: 1296
#rpl_ndb_log
: result not deterministic
rpl_ndb_log
: result not deterministic
rpl_ndb_relay_space : Bug#16993
rpl_ndb_relay_space : Bug#16993
rpl_ndb_multi_update3 : Bug#17400: delete & update of rows in table without pk fails
rpl_ndb_multi_update3 : Bug#17400: delete & update of rows in table without pk fails
rpl_ndb_sp007 : Bug #17290
rpl_ndb_sp007 : Bug #17290
rpl_sp : Bug#16456
rpl_sp : Bug#16456
rpl_until : Unstable test case, bug#15886
rpl_until : Unstable test case, bug#15886
sp-goto : GOTO is currently is disabled - will be fixed in the future
sp-goto : GOTO is currently is disabled - will be fixed in the future
rpl_ndb_log : results are not deterministic
mysqldump : Bug#17443 mysqlimport --use-threads=5 gives crashes
mysqldump : Bug#17443 mysqlimport --use-threads=5 gives crashes
mysql-test/t/rpl_row_drop.test
View file @
ef1b1e40
...
@@ -31,8 +31,8 @@ connection master;
...
@@ -31,8 +31,8 @@ connection master;
# Should drop the non-temporary table t1 and the temporary table t2
# Should drop the non-temporary table t1 and the temporary table t2
DROP
TABLE
t1
,
t2
;
DROP
TABLE
t1
,
t2
;
let
$VERSION
=
`select version()`
;
let
$VERSION
=
`select version()`
;
--
replace_result
$VERSION
VERSION
#
--replace_result $VERSION VERSION
SHOW
BINLOG
EVENTS
;
#
SHOW BINLOG EVENTS;
SHOW
TABLES
;
SHOW
TABLES
;
sync_slave_with_master
;
sync_slave_with_master
;
--
echo
****
On
Slave
****
--
echo
****
On
Slave
****
...
...
mysql-test/t/rpl_row_sp010.test
View file @
ef1b1e40
...
@@ -37,7 +37,7 @@ BEGIN
...
@@ -37,7 +37,7 @@ BEGIN
END
|
END
|
delimiter
;
|
delimiter
;
|
CALL
test
.
p2
();
CALL
test
.
p2
();
SELECT
*
FROM
test
.
t1
;
SELECT
*
FROM
test
.
t1
ORDER
BY
a
;
save_master_pos
;
save_master_pos
;
connection
slave
;
connection
slave
;
...
@@ -59,12 +59,12 @@ BEGIN
...
@@ -59,12 +59,12 @@ BEGIN
END
|
END
|
delimiter
;
|
delimiter
;
|
CALL
test
.
p4
();
CALL
test
.
p4
();
SELECT
*
FROM
test
.
t2
;
SELECT
*
FROM
test
.
t2
ORDER
BY
a
;
save_master_pos
;
save_master_pos
;
connection
slave
;
connection
slave
;
sync_with_master
;
sync_with_master
;
SELECT
*
FROM
test
.
t2
;
SELECT
*
FROM
test
.
t2
ORDER
BY
a
;
# Cleanup
# Cleanup
connection
master
;
connection
master
;
...
...
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