mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
into  mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
This commit is contained in:
unknown 2006-05-12 14:28:16 +02:00
commit 19b401247e
6 changed files with 33 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/extra/rpl_tests/rpl_flsh_tbls.test
View file

@ -3,6 +3,8 @@
# RENAME TABLE work with MERGE tables on the slave.
# Test of FLUSH NO_WRITE_TO_BINLOG by the way.
#
-- source include/master-slave.inc
create table t1 (a int);

16
mysql-test/r/rpl_sp004.result
View file

@ -26,25 +26,25 @@ DROP TABLE IF EXISTS test.t2;
INSERT INTO test.t3 VALUES(NULL,11111111.233333,NOW());
END|
CALL test.p1();
SELECT * FROM test.t1;
SELECT * FROM test.t1 ORDER BY a;
a
1
2
3
12
SELECT * FROM test.t2;
SELECT * FROM test.t2 ORDER BY a;
a
1
2
3
8
SELECT * FROM test.t1;
SELECT * FROM test.t1 ORDER BY a;
a
1
2
3
12
SELECT * FROM test.t2;
SELECT * FROM test.t2 ORDER BY a;
a
1
2
@ -62,25 +62,25 @@ t3
CALL test.p1();
Warnings:
Note 1050 Table 't3' already exists
SELECT * FROM test.t1;
SELECT * FROM test.t1 ORDER BY a;
a
1
2
3
12
SELECT * FROM test.t2;
SELECT * FROM test.t2 ORDER BY a;
a
1
2
3
8
SELECT * FROM test.t1;
SELECT * FROM test.t1 ORDER BY a;
a
1
2
3
12
SELECT * FROM test.t2;
SELECT * FROM test.t2 ORDER BY a;
a
1
2

4
mysql-test/t/rpl_multi_engine.test
View file

@ -1,5 +1,9 @@
# 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
connection slave;

6
mysql-test/t/rpl_row_basic_11bugs.test
View file

@ -1,5 +1,11 @@
--source include/have_row_based.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
# Bug#15942 (RBR ignores --binlog_ignore_db and tries to map to table

5
mysql-test/t/rpl_row_flsh_tbls.test
View file

@ -6,6 +6,11 @@ let $rename_event_pos= 615;
# 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
# we disable the ps-protocol for this statement.
# Merge tables are not supported in NDB
-- source include/not_ndb_default.inc
--disable_ps_protocol
-- source extra/rpl_tests/rpl_flsh_tbls.test
--enable_ps_protocol

16
mysql-test/t/rpl_sp004.test
View file

@ -44,13 +44,13 @@ END|
delimiter ;|
CALL test.p1();
SELECT * FROM test.t1;
SELECT * FROM test.t2;
SELECT * FROM test.t1 ORDER BY a;
SELECT * FROM test.t2 ORDER BY a;
save_master_pos;
connection slave;
sync_with_master;
SELECT * FROM test.t1;
SELECT * FROM test.t2;
SELECT * FROM test.t1 ORDER BY a;
SELECT * FROM test.t2 ORDER BY a;
connection master;
CALL test.p2();
@ -66,14 +66,14 @@ SHOW TABLES;
connection master;
CALL test.p1();
SELECT * FROM test.t1;
SELECT * FROM test.t2;
SELECT * FROM test.t1 ORDER BY a;
SELECT * FROM test.t2 ORDER BY a;
#SELECT * FROM test.t3;
save_master_pos;
connection slave;
sync_with_master;
SELECT * FROM test.t1;
SELECT * FROM test.t2;
SELECT * FROM test.t1 ORDER BY a;
SELECT * FROM test.t2 ORDER BY a;
#SELECT * FROM test.t3;
--exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/sp004_master.sql