Commit 6dc4a129 authored by unknown's avatar unknown

Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509

parents 7b30dc9e 19b40124
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
# RENAME TABLE work with MERGE tables on the slave. # RENAME TABLE work with MERGE tables on the slave.
# Test of FLUSH NO_WRITE_TO_BINLOG by the way. # Test of FLUSH NO_WRITE_TO_BINLOG by the way.
# #
-- source include/master-slave.inc -- source include/master-slave.inc
create table t1 (a int); create table t1 (a int);
......
...@@ -26,25 +26,25 @@ DROP TABLE IF EXISTS test.t2; ...@@ -26,25 +26,25 @@ DROP TABLE IF EXISTS test.t2;
INSERT INTO test.t3 VALUES(NULL,11111111.233333,NOW()); INSERT INTO test.t3 VALUES(NULL,11111111.233333,NOW());
END| END|
CALL test.p1(); CALL test.p1();
SELECT * FROM test.t1; SELECT * FROM test.t1 ORDER BY a;
a a
1 1
2 2
3 3
12 12
SELECT * FROM test.t2; SELECT * FROM test.t2 ORDER BY a;
a a
1 1
2 2
3 3
8 8
SELECT * FROM test.t1; SELECT * FROM test.t1 ORDER BY a;
a a
1 1
2 2
3 3
12 12
SELECT * FROM test.t2; SELECT * FROM test.t2 ORDER BY a;
a a
1 1
2 2
...@@ -62,25 +62,25 @@ t3 ...@@ -62,25 +62,25 @@ t3
CALL test.p1(); CALL test.p1();
Warnings: Warnings:
Note 1050 Table 't3' already exists Note 1050 Table 't3' already exists
SELECT * FROM test.t1; SELECT * FROM test.t1 ORDER BY a;
a a
1 1
2 2
3 3
12 12
SELECT * FROM test.t2; SELECT * FROM test.t2 ORDER BY a;
a a
1 1
2 2
3 3
8 8
SELECT * FROM test.t1; SELECT * FROM test.t1 ORDER BY a;
a a
1 1
2 2
3 3
12 12
SELECT * FROM test.t2; SELECT * FROM test.t2 ORDER BY a;
a a
1 1
2 2
......
# See if replication between MyISAM, MEMORY and InnoDB works. # See if replication between MyISAM, MEMORY and InnoDB works.
#This test case is not written for NDB, result files do not
#match when NDB is the default engine
-- source include/not_ndb_default.inc
-- source include/master-slave.inc -- source include/master-slave.inc
connection slave; connection slave;
......
--source include/have_row_based.inc --source include/have_row_based.inc
--source include/have_binlog_format_row.inc --source include/have_binlog_format_row.inc
#This test case is not written for NDB, the result files
#will not match when NDB is the default engine
-- source include/not_ndb_default.inc
--source include/master-slave.inc --source include/master-slave.inc
# Bug#15942 (RBR ignores --binlog_ignore_db and tries to map to table # Bug#15942 (RBR ignores --binlog_ignore_db and tries to map to table
......
...@@ -6,6 +6,11 @@ let $rename_event_pos= 615; ...@@ -6,6 +6,11 @@ let $rename_event_pos= 615;
# Bug#18326: Do not lock table for writing during prepare of statement # Bug#18326: Do not lock table for writing during prepare of statement
# The use of the ps protocol causes extra table maps in the binlog, so # The use of the ps protocol causes extra table maps in the binlog, so
# we disable the ps-protocol for this statement. # we disable the ps-protocol for this statement.
# Merge tables are not supported in NDB
-- source include/not_ndb_default.inc
--disable_ps_protocol --disable_ps_protocol
-- source extra/rpl_tests/rpl_flsh_tbls.test -- source extra/rpl_tests/rpl_flsh_tbls.test
--enable_ps_protocol --enable_ps_protocol
......
...@@ -44,13 +44,13 @@ END| ...@@ -44,13 +44,13 @@ END|
delimiter ;| delimiter ;|
CALL test.p1(); CALL test.p1();
SELECT * FROM test.t1; SELECT * FROM test.t1 ORDER BY a;
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.t1; SELECT * FROM test.t1 ORDER BY a;
SELECT * FROM test.t2; SELECT * FROM test.t2 ORDER BY a;
connection master; connection master;
CALL test.p2(); CALL test.p2();
...@@ -66,14 +66,14 @@ SHOW TABLES; ...@@ -66,14 +66,14 @@ SHOW TABLES;
connection master; connection master;
CALL test.p1(); CALL test.p1();
SELECT * FROM test.t1; SELECT * FROM test.t1 ORDER BY a;
SELECT * FROM test.t2; SELECT * FROM test.t2 ORDER BY a;
#SELECT * FROM test.t3; #SELECT * FROM test.t3;
save_master_pos; save_master_pos;
connection slave; connection slave;
sync_with_master; sync_with_master;
SELECT * FROM test.t1; SELECT * FROM test.t1 ORDER BY a;
SELECT * FROM test.t2; SELECT * FROM test.t2 ORDER BY a;
#SELECT * FROM test.t3; #SELECT * FROM test.t3;
--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/sp004_master.sql --exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/sp004_master.sql
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment