Below is the list of changes that have just been committed into a local
5.1 repository of ndbdev. When ndbdev does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
ChangeSet
1.2137 06/02/07 00:18:10 jmiller@stripped +23 -0
More test case updates for using RPL with NDB as default engine
mysql-test/t/disabled.def
1.59 06/02/07 00:17:04 jmiller@stripped +1 -0
Updated with MySQL Bugs: #17158
mysql-test/t/rpl_ndb_log-master.opt
1.1 06/02/06 23:12:02 jmiller@stripped +1 -0
part of rpl_log.test check in
mysql-test/t/rpl_ndb_log-master.opt
1.0 06/02/06 23:12:02 jmiller@stripped +0 -0
BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_ndb_log-master.opt
mysql-test/t/rpl_ndb_log.test
1.1 06/02/06 23:11:43 jmiller@stripped +12 -0
part of rpl_log.test check in
mysql-test/t/rpl_ndb_log.test
1.0 06/02/06 23:11:43 jmiller@stripped +0 -0
BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_ndb_log.test
mysql-test/r/rpl_ndb_log.result
1.1 06/02/06 23:11:27 jmiller@stripped +139 -0
part of rpl_log.test check in
mysql-test/r/rpl_ndb_log.result
1.0 06/02/06 23:11:27 jmiller@stripped +0 -0
BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/r/rpl_ndb_log.result
mysql-test/t/rpl_row_log_innodb.test
1.1 06/02/06 23:06:42 jmiller@stripped +12 -0
part of rpl_log.test check in
mysql-test/t/rpl_row_log_innodb-slave.opt
1.1 06/02/06 23:06:42 jmiller@stripped +1 -0
part of rpl_log.test check in
mysql-test/t/rpl_row_log_innodb-master.opt
1.1 06/02/06 23:06:42 jmiller@stripped +1 -0
part of rpl_log.test check in
mysql-test/t/rpl_row_log_innodb.test
1.0 06/02/06 23:06:42 jmiller@stripped +0 -0
BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_row_log_innodb.test
mysql-test/t/rpl_row_log_innodb-slave.opt
1.0 06/02/06 23:06:42 jmiller@stripped +0 -0
BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_row_log_innodb-slave.opt
mysql-test/t/rpl_row_log_innodb-master.opt
1.0 06/02/06 23:06:42 jmiller@stripped +0 -0
BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_row_log_innodb-master.opt
mysql-test/r/rpl_row_log_innodb.result
1.1 06/02/06 23:06:27 jmiller@stripped +113 -0
part of rpl_log.test check in
mysql-test/r/rpl_row_log_innodb.result
1.0 06/02/06 23:06:27 jmiller@stripped +0 -0
BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/r/rpl_row_log_innodb.result
mysql-test/r/rpl_row_log.result
1.2 06/02/06 23:06:17 jmiller@stripped +21 -21
part of rpl_log.test check in
mysql-test/t/rpl_row_log.test
1.1 06/02/06 23:05:58 jmiller@stripped +11 -0
part of rpl_log.test check in
mysql-test/t/rpl_row_log.test
1.0 06/02/06 23:05:58 jmiller@stripped +0 -0
BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_row_log.test
mysql-test/extra/rpl_tests/rpl_log.test
1.29 06/02/06 23:04:52 jmiller@stripped +12 -4
Updated test to ensure that MyISAM, and innodb engines passed even if NDB was used as default engine. Due to diff in bin log output between MyISAM, InnoDB and NDB the file had to use different wrappers and results files.
BitKeeper/deleted/.del-rpl_row_log.test~f6ed1be9e3ca110f
1.4 06/02/03 20:52:09 jmiller@stripped +0 -4
Delete: mysql-test/extra/rpl_tests/rpl_row_log.test
mysql-test/extra/rpl_tests/rpl_row_log.test
1.3 06/02/03 20:41:04 jmiller@stripped +0 -0
Rename: mysql-test/t/rpl_row_log.test -> mysql-test/extra/rpl_tests/rpl_row_log.test
mysql-test/t/rpl_row_sp001.test
1.2 06/02/03 20:37:30 jmiller@stripped +8 -8
updated with order by
mysql-test/r/rpl_row_sp001.result
1.2 06/02/03 20:37:21 jmiller@stripped +8 -8
updated with order by
mysql-test/r/rpl_ndb_func003.result
1.1 06/02/03 20:27:50 jmiller@stripped +29 -0
New func003 wrapper to use NDB engine for table creation
mysql-test/r/rpl_ndb_func003.result
1.0 06/02/03 20:27:50 jmiller@stripped +0 -0
BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/r/rpl_ndb_func003.result
mysql-test/t/rpl_ndb_func003.test
1.1 06/02/03 20:27:37 jmiller@stripped +11 -0
New func003 wrapper to use NDB engine for table creation
mysql-test/t/rpl_ndb_func003.test
1.0 06/02/03 20:27:37 jmiller@stripped +0 -0
BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_ndb_func003.test
mysql-test/r/rpl_redirect.result
1.15 06/02/03 20:20:17 jmiller@stripped +4 -4
updated with order by
mysql-test/t/rpl_redirect.test
1.14 06/02/03 20:20:02 jmiller@stripped +4 -4
updated with order by
mysql-test/r/rpl_replicate_do.result
1.32 06/02/03 20:15:06 jmiller@stripped +1 -1
Updated with order by for use during ndb testing
mysql-test/t/rpl_replicate_do.test
1.24 06/02/03 20:14:56 jmiller@stripped +1 -1
Updated with order by for use during ndb testing
mysql-test/t/rpl_row_func003-slave.opt
1.1 06/02/03 20:07:27 jmiller@stripped +1 -0
new opt file to enusre innodb on slave
mysql-test/t/rpl_row_func003-slave.opt
1.0 06/02/03 20:07:27 jmiller@stripped +0 -0
BitKeeper file /home/ndbdev/jmiller/clones/mysql-5.1-new/mysql-test/t/rpl_row_func003-slave.opt
mysql-test/r/rpl_create_database.result
1.8 06/02/03 19:02:15 jmiller@stripped +8 -10
Updated to pass when other default engines are being used
mysql-test/t/rpl_create_database.test
1.6 06/02/03 19:02:01 jmiller@stripped +4 -2
Updated to pass when other default engines are being used
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: jmiller
# Host: ndb08.mysql.com
# Root: /home/ndbdev/jmiller/clones/mysql-5.1-new
--- New file ---
+++ mysql-test/r/rpl_ndb_func003.result 06/02/03 20:27:50
stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
DROP FUNCTION IF EXISTS test.f1;
DROP TABLE IF EXISTS test.t1;
CREATE TABLE test.t1 (a INT NOT NULL AUTO_INCREMENT, c CHAR(16),PRIMARY KEY(a))ENGINE=NDB;
create function test.f1() RETURNS CHAR(16)
BEGIN
DECLARE tmp CHAR(16);
DECLARE var_name FLOAT;
SET var_name = RAND();
IF var_name > .6
THEN SET tmp = 'Texas';
ELSE SET tmp = 'MySQL';
END IF;
RETURN tmp;
END|
INSERT INTO test.t1 VALUES (null,test.f1()),(null,test.f1()),(null,test.f1());
INSERT INTO test.t1 VALUES (null,test.f1()),(null,test.f1()),(null,test.f1());
SET AUTOCOMMIT=0;
START TRANSACTION;
INSERT INTO test.t1 VALUES (null,test.f1());
ROLLBACK;
SET AUTOCOMMIT=1;
DROP FUNCTION test.f1;
DROP TABLE test.t1;
--- New file ---
+++ mysql-test/r/rpl_ndb_log.result 06/02/06 23:11:27
stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
stop slave;
reset master;
reset slave;
reset master;
create table t1(n int not null auto_increment primary key)ENGINE=NDB;
insert into t1 values (NULL);
drop table t1;
create table t1 (word char(20) not null)ENGINE=NDB;
load data infile '../../std_data/words.dat' into table t1 ignore 1 lines;
select count(*) from t1;
count(*)
69
drop table t1;
show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB
master-bin.000001 # Query 1 # BEGIN
master-bin.000001 # Table_map 1 # cluster_replication.apply_status
master-bin.000001 # Write_rows 1 #
master-bin.000001 # Table_map 1 # test.t1
master-bin.000001 # Write_rows 1 #
master-bin.000001 # Query 1 # COMMIT
master-bin.000001 # Query 1 # use `test`; drop table t1
master-bin.000001 # Query 1 # use `test`; create table t1 (word char(20) not null)ENGINE=NDB
master-bin.000001 # Query 1 # BEGIN
master-bin.000001 # Table_map 1 # cluster_replication.apply_status
master-bin.000001 # Write_rows 1 #
master-bin.000001 # Query 1 # COMMIT
master-bin.000001 # Query 1 # use `test`; drop table t1
show binlog events from 102 limit 1;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB
show binlog events from 102 limit 2;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB
master-bin.000001 # Query 1 # BEGIN
show binlog events from 102 limit 2,1;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Table_map 1 # cluster_replication.apply_status
flush logs;
create table t5 (a int)ENGINE=NDB;
drop table t5;
start slave;
flush logs;
stop slave;
create table t1 (n int)ENGINE=NDB;
insert into t1 values (1);
drop table t1;
show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB
master-bin.000001 # Query 1 # BEGIN
master-bin.000001 # Table_map 1 # cluster_replication.apply_status
master-bin.000001 # Write_rows 1 #
master-bin.000001 # Table_map 1 # test.t1
master-bin.000001 # Write_rows 1 #
master-bin.000001 # Query 1 # COMMIT
master-bin.000001 # Query 1 # use `test`; drop table t1
master-bin.000001 # Query 1 # use `test`; create table t1 (word char(20) not null)ENGINE=NDB
master-bin.000001 # Query 1 # BEGIN
master-bin.000001 # Table_map 1 # cluster_replication.apply_status
master-bin.000001 # Write_rows 1 #
master-bin.000001 # Query 1 # COMMIT
master-bin.000001 # Query 1 # use `test`; drop table t1
master-bin.000001 # Rotate 1 # master-bin.000002;pos=4
show binlog events in 'master-bin.000002';
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000002 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
master-bin.000002 # Query 1 # use `test`; create table t5 (a int)ENGINE=NDB
master-bin.000002 # Query 1 # BEGIN
master-bin.000002 # Table_map 1 # cluster_replication.apply_status
master-bin.000002 # Write_rows 1 #
master-bin.000002 # Query 1 # COMMIT
master-bin.000002 # Query 1 # use `test`; drop table t5
master-bin.000002 # Query 1 # use `test`; create table t1 (n int)ENGINE=NDB
master-bin.000002 # Query 1 # BEGIN
master-bin.000002 # Table_map 1 # cluster_replication.apply_status
master-bin.000002 # Write_rows 1 #
master-bin.000002 # Table_map 1 # test.t1
master-bin.000002 # Write_rows 1 #
master-bin.000002 # Query 1 # COMMIT
master-bin.000002 # Query 1 # use `test`; drop table t1
show binary logs;
Log_name File_size
master-bin.000001 1087
master-bin.000002 991
start slave;
show binary logs;
Log_name File_size
slave-bin.000001 1494
slave-bin.000002 583
show binlog events in 'slave-bin.000001' from 4;
Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
slave-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=NDB
slave-bin.000001 # Query 2 # BEGIN
slave-bin.000001 # Table_map 2 # cluster_replication.apply_status
slave-bin.000001 # Write_rows 2 #
slave-bin.000001 # Table_map 2 # test.t1
slave-bin.000001 # Write_rows 2 #
slave-bin.000001 # Query 2 # COMMIT
slave-bin.000001 # Query 1 # use `test`; drop table t1
slave-bin.000001 # Query 1 # use `test`; create table t1 (word char(20) not null)ENGINE=NDB
slave-bin.000001 # Query 2 # BEGIN
slave-bin.000001 # Table_map 2 # cluster_replication.apply_status
slave-bin.000001 # Write_rows 2 #
slave-bin.000001 # Query 2 # COMMIT
slave-bin.000001 # Query 1 # use `test`; drop table t1
slave-bin.000001 # Query 1 # use `test`; create table t5 (a int)ENGINE=NDB
slave-bin.000001 # Query 2 # BEGIN
slave-bin.000001 # Table_map 2 # cluster_replication.apply_status
slave-bin.000001 # Write_rows 2 #
slave-bin.000001 # Query 2 # COMMIT
slave-bin.000001 # Query 1 # use `test`; drop table t5
slave-bin.000001 # Rotate 2 # slave-bin.000002;pos=4
show binlog events in 'slave-bin.000002' from 4;
Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000002 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
slave-bin.000002 # Query 1 # use `test`; create table t1 (n int)ENGINE=NDB
slave-bin.000002 # Query 2 # BEGIN
slave-bin.000002 # Table_map 2 # cluster_replication.apply_status
slave-bin.000002 # Write_rows 2 #
slave-bin.000002 # Table_map 2 # test.t1
slave-bin.000002 # Write_rows 2 #
slave-bin.000002 # Query 2 # COMMIT
slave-bin.000002 # Query 1 # use `test`; drop table t1
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
# 127.0.0.1 root MASTER_PORT 1 master-bin.000002 991 # # master-bin.000002 Yes Yes # 0 0 991 # None 0 No #
show binlog events in 'slave-bin.000005' from 4;
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
--- New file ---
+++ mysql-test/r/rpl_row_log_innodb.result 06/02/06 23:06:27
stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
stop slave;
reset master;
reset slave;
reset master;
create table t1(n int not null auto_increment primary key)ENGINE=InnoDB;
insert into t1 values (NULL);
drop table t1;
create table t1 (word char(20) not null)ENGINE=InnoDB;
load data infile '../../std_data/words.dat' into table t1 ignore 1 lines;
select count(*) from t1;
count(*)
69
drop table t1;
show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=InnoDB
master-bin.000001 # Table_map 1 # test.t1
master-bin.000001 # Write_rows 1 #
master-bin.000001 # Xid 1 # COMMIT /* XID */
master-bin.000001 # Query 1 # use `test`; drop table t1
master-bin.000001 # Query 1 # use `test`; create table t1 (word char(20) not null)ENGINE=InnoDB
master-bin.000001 # Table_map 1 # test.t1
master-bin.000001 # Write_rows 1 #
master-bin.000001 # Xid 1 # COMMIT /* XID */
master-bin.000001 # Query 1 # use `test`; drop table t1
show binlog events from 102 limit 1;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=InnoDB
show binlog events from 102 limit 2;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=InnoDB
master-bin.000001 # Table_map 1 # test.t1
show binlog events from 102 limit 2,1;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Write_rows 1 #
flush logs;
create table t5 (a int)ENGINE=InnoDB;
drop table t5;
start slave;
flush logs;
stop slave;
create table t1 (n int)ENGINE=InnoDB;
insert into t1 values (1);
drop table t1;
show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=InnoDB
master-bin.000001 # Table_map 1 # test.t1
master-bin.000001 # Write_rows 1 #
master-bin.000001 # Xid 1 # COMMIT /* XID */
master-bin.000001 # Query 1 # use `test`; drop table t1
master-bin.000001 # Query 1 # use `test`; create table t1 (word char(20) not null)ENGINE=InnoDB
master-bin.000001 # Table_map 1 # test.t1
master-bin.000001 # Write_rows 1 #
master-bin.000001 # Xid 1 # COMMIT /* XID */
master-bin.000001 # Query 1 # use `test`; drop table t1
master-bin.000001 # Rotate 1 # master-bin.000002;pos=4
show binlog events in 'master-bin.000002';
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000002 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
master-bin.000002 # Query 1 # use `test`; create table t5 (a int)ENGINE=InnoDB
master-bin.000002 # Query 1 # use `test`; drop table t5
master-bin.000002 # Query 1 # use `test`; create table t1 (n int)ENGINE=InnoDB
master-bin.000002 # Table_map 1 # test.t1
master-bin.000002 # Write_rows 1 #
master-bin.000002 # Xid 1 # COMMIT /* XID */
master-bin.000002 # Query 1 # use `test`; drop table t1
show binary logs;
Log_name File_size
master-bin.000001 1386
master-bin.000002 552
start slave;
show binary logs;
Log_name File_size
slave-bin.000001 1560
slave-bin.000002 377
show binlog events in 'slave-bin.000001' from 4;
Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
slave-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=InnoDB
slave-bin.000001 # Table_map 1 # test.t1
slave-bin.000001 # Write_rows 1 #
slave-bin.000001 # Xid 1 # COMMIT /* XID */
slave-bin.000001 # Query 1 # use `test`; drop table t1
slave-bin.000001 # Query 1 # use `test`; create table t1 (word char(20) not null)ENGINE=InnoDB
slave-bin.000001 # Table_map 1 # test.t1
slave-bin.000001 # Write_rows 1 #
slave-bin.000001 # Xid 1 # COMMIT /* XID */
slave-bin.000001 # Query 1 # use `test`; drop table t1
slave-bin.000001 # Query 1 # use `test`; create table t5 (a int)ENGINE=InnoDB
slave-bin.000001 # Query 1 # use `test`; drop table t5
slave-bin.000001 # Rotate 2 # slave-bin.000002;pos=4
show binlog events in 'slave-bin.000002' from 4;
Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000002 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
slave-bin.000002 # Query 1 # use `test`; create table t1 (n int)ENGINE=InnoDB
slave-bin.000002 # Table_map 1 # test.t1
slave-bin.000002 # Write_rows 1 #
slave-bin.000002 # Xid 1 # COMMIT /* XID */
slave-bin.000002 # Query 1 # use `test`; drop table t1
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
# 127.0.0.1 root MASTER_PORT 1 master-bin.000002 552 # # master-bin.000002 Yes Yes # 0 0 552 # None 0 No #
show binlog events in 'slave-bin.000005' from 4;
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
--- New file ---
+++ mysql-test/t/rpl_ndb_func003.test 06/02/03 20:27:37
###################################
# Wrapper for rpl_row_func003.test#
# This test was orginally designed#
# To test InnoDB using RBR, but #
# It can also be used to test NDB #
# So this wrapper is being used to#
# reduce test case code #
###################################
-- source include/have_ndb.inc
let $engine_type=NDB;
-- source extra/rpl_tests/rpl_row_func003.test
--- New file ---
+++ mysql-test/t/rpl_ndb_log-master.opt 06/02/06 23:12:02
--skip-external-locking
--- New file ---
+++ mysql-test/t/rpl_ndb_log.test 06/02/06 23:11:43
###################################
# Wrapper for rpl_row_log.test #
# Added wrapper so that MyISAM & #
# Innodb and NDB could all use the#
# Same test. NDB produced a diff #
# bin-log #
###################################
-- source include/have_binlog_format_row.inc
-- source include/have_ndb.inc
let $engine_type=NDB;
-- source extra/rpl_tests/rpl_log.test
--- New file ---
+++ mysql-test/t/rpl_row_func003-slave.opt 06/02/03 20:07:27
--innodb
--- New file ---
+++ mysql-test/t/rpl_row_log.test 06/02/06 23:05:58
###################################
# Wrapper for rpl_row_log.test #
# Added wrapper so that MyISAM & #
# Innodb and NDB could all use the#
# Same test. NDB produced a diff #
# bin-log #
###################################
-- source include/have_binlog_format_row.inc
let $engine_type=MyISAM;
-- source extra/rpl_tests/rpl_log.test
--- New file ---
+++ mysql-test/t/rpl_row_log_innodb-master.opt 06/02/06 23:06:42
--skip-external-locking
--- New file ---
+++ mysql-test/t/rpl_row_log_innodb-slave.opt 06/02/06 23:06:42
--innodb
--- New file ---
+++ mysql-test/t/rpl_row_log_innodb.test 06/02/06 23:06:42
###################################
# Wrapper for rpl_row_log.test #
# Added wrapper so that MyISAM & #
# Innodb and NDB could all use the#
# Same test. NDB produced a diff #
# bin-log #
###################################
-- source include/have_binlog_format_row.inc
-- source include/have_innodb.inc
let $engine_type=InnoDB;
-- source extra/rpl_tests/rpl_log.test
--- 1.58/mysql-test/t/disabled.def 2006-02-06 15:59:28 +01:00
+++ 1.59/mysql-test/t/disabled.def 2006-02-07 00:17:04 +01:00
@@ -32,3 +32,4 @@
rpl_ndb_auto_inc : MySQL Bugs:17086
rpl_ndb_relay_space : Results are not deterministic
ndb_binlog_ddl_multi : Bug #17038
+rpl_ndb_log : MySQL Bugs: #17158
--- 1.1/mysql-test/r/rpl_row_log.result 2005-12-22 06:34:53 +01:00
+++ 1.2/mysql-test/r/rpl_row_log.result 2006-02-06 23:06:17 +01:00
@@ -8,10 +8,10 @@
reset master;
reset slave;
reset master;
-create table t1(n int not null auto_increment primary key);
+create table t1(n int not null auto_increment primary key)ENGINE=MyISAM;
insert into t1 values (NULL);
drop table t1;
-create table t1 (word char(20) not null);
+create table t1 (word char(20) not null)ENGINE=MyISAM;
load data infile '../../std_data/words.dat' into table t1 ignore 1 lines;
select count(*) from t1;
count(*)
@@ -20,41 +20,41 @@
show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
master-bin.000001 # Table_map 1 # test.t1
master-bin.000001 # Write_rows 1 #
master-bin.000001 # Query 1 # use `test`; drop table t1
-master-bin.000001 # Query 1 # use `test`; create table t1 (word char(20) not null)
+master-bin.000001 # Query 1 # use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM
master-bin.000001 # Table_map 1 # test.t1
master-bin.000001 # Write_rows 1 #
master-bin.000001 # Query 1 # use `test`; drop table t1
show binlog events from 102 limit 1;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
show binlog events from 102 limit 2;
Log_name Pos Event_type Server_id End_log_pos Info
-master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
master-bin.000001 # Table_map 1 # test.t1
show binlog events from 102 limit 2,1;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Write_rows 1 #
flush logs;
-create table t5 (a int);
+create table t5 (a int)ENGINE=MyISAM;
drop table t5;
start slave;
flush logs;
stop slave;
-create table t1 (n int);
+create table t1 (n int)ENGINE=MyISAM;
insert into t1 values (1);
drop table t1;
show binlog events;
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000001 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)
+master-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
master-bin.000001 # Table_map 1 # test.t1
master-bin.000001 # Write_rows 1 #
master-bin.000001 # Query 1 # use `test`; drop table t1
-master-bin.000001 # Query 1 # use `test`; create table t1 (word char(20) not null)
+master-bin.000001 # Query 1 # use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM
master-bin.000001 # Table_map 1 # test.t1
master-bin.000001 # Write_rows 1 #
master-bin.000001 # Query 1 # use `test`; drop table t1
@@ -62,44 +62,44 @@
show binlog events in 'master-bin.000002';
Log_name Pos Event_type Server_id End_log_pos Info
master-bin.000002 # Format_desc 1 # Server ver: VERSION, Binlog ver: 4
-master-bin.000002 # Query 1 # use `test`; create table t5 (a int)
+master-bin.000002 # Query 1 # use `test`; create table t5 (a int)ENGINE=MyISAM
master-bin.000002 # Query 1 # use `test`; drop table t5
-master-bin.000002 # Query 1 # use `test`; create table t1 (n int)
+master-bin.000002 # Query 1 # use `test`; create table t1 (n int)ENGINE=MyISAM
master-bin.000002 # Table_map 1 # test.t1
master-bin.000002 # Write_rows 1 #
master-bin.000002 # Query 1 # use `test`; drop table t1
show binary logs;
Log_name File_size
-master-bin.000001 1306
-master-bin.000002 499
+master-bin.000001 1332
+master-bin.000002 525
start slave;
show binary logs;
Log_name File_size
-slave-bin.000001 1467
-slave-bin.000002 337
+slave-bin.000001 1506
+slave-bin.000002 350
show binlog events in 'slave-bin.000001' from 4;
Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000001 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)
+slave-bin.000001 # Query 1 # use `test`; create table t1(n int not null auto_increment primary key)ENGINE=MyISAM
slave-bin.000001 # Table_map 1 # test.t1
slave-bin.000001 # Write_rows 1 #
slave-bin.000001 # Query 1 # use `test`; drop table t1
-slave-bin.000001 # Query 1 # use `test`; create table t1 (word char(20) not null)
+slave-bin.000001 # Query 1 # use `test`; create table t1 (word char(20) not null)ENGINE=MyISAM
slave-bin.000001 # Table_map 1 # test.t1
slave-bin.000001 # Write_rows 1 #
slave-bin.000001 # Query 1 # use `test`; drop table t1
-slave-bin.000001 # Query 1 # use `test`; create table t5 (a int)
+slave-bin.000001 # Query 1 # use `test`; create table t5 (a int)ENGINE=MyISAM
slave-bin.000001 # Query 1 # use `test`; drop table t5
slave-bin.000001 # Rotate 2 # slave-bin.000002;pos=4
show binlog events in 'slave-bin.000002' from 4;
Log_name Pos Event_type Server_id End_log_pos Info
slave-bin.000002 # Format_desc 2 # Server ver: VERSION, Binlog ver: 4
-slave-bin.000002 # Query 1 # use `test`; create table t1 (n int)
+slave-bin.000002 # Query 1 # use `test`; create table t1 (n int)ENGINE=MyISAM
slave-bin.000002 # Table_map 1 # test.t1
slave-bin.000002 # Write_rows 1 #
slave-bin.000002 # Query 1 # use `test`; drop table t1
show slave status;
Slave_IO_State Master_Host Master_User Master_Port Connect_Retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_Do_DB Replicate_Ignore_DB Replicate_Do_Table Replicate_Ignore_Table Replicate_Wild_Do_Table Replicate_Wild_Ignore_Table Last_Errno Last_Error Skip_Counter Exec_Master_Log_Pos Relay_Log_Space Until_Condition Until_Log_File Until_Log_Pos Master_SSL_Allowed Master_SSL_CA_File Master_SSL_CA_Path Master_SSL_Cert Master_SSL_Cipher Master_SSL_Key Seconds_Behind_Master
-# 127.0.0.1 root MASTER_PORT 1 master-bin.000002 499 # # master-bin.000002 Yes Yes # 0 0 499 # None 0 No #
+# 127.0.0.1 root MASTER_PORT 1 master-bin.000002 525 # # master-bin.000002 Yes Yes # 0 0 525 # None 0 No #
show binlog events in 'slave-bin.000005' from 4;
ERROR HY000: Error when executing command SHOW BINLOG EVENTS: Could not find target log
--- 1.1/mysql-test/r/rpl_row_sp001.result 2005-12-22 06:34:54 +01:00
+++ 1.2/mysql-test/r/rpl_row_sp001.result 2006-02-03 20:37:21 +01:00
@@ -28,52 +28,52 @@
END CASE;
end//
INSERT INTO test.t2 VALUES(NULL,'NEW'),(NULL,'NEW'),(NULL,'NEW'),(NULL,'NEW');
-select * from test.t2;
+SELECT * FROM t2 ORDER BY a;
a t
1 NEW
2 NEW
3 NEW
4 NEW
-select * from test.t2;
+SELECT * FROM t2 ORDER BY a;
a t
1 NEW
2 NEW
3 NEW
4 NEW
call test.p2(1);
-select * from test.t2;
+SELECT * FROM t2 ORDER BY a;
a t
1 Tex
2 Tex
3 Tex
4 Tex
-select * from test.t2;
+SELECT * FROM t2 ORDER BY a;
a t
1 Tex
2 Tex
3 Tex
4 Tex
call test.p2(2);
-select * from test.t2;
+SELECT * FROM t2 ORDER BY a;
a t
1 SQL
2 SQL
3 SQL
4 SQL
-select * from test.t2;
+SELECT * FROM t2 ORDER BY a;
a t
1 SQL
2 SQL
3 SQL
4 SQL
call test.p2(3);
-select * from test.t2;
+SELECT * FROM t2 ORDER BY a;
a t
1 NONE
2 NONE
3 NONE
4 NONE
-select * from test.t2;
+SELECT * FROM t2 ORDER BY a;
a t
1 NONE
2 NONE
--- 1.2/mysql-test/t/rpl_row_log.test 2005-12-23 13:52:45 +01:00
+++ 1.4/BitKeeper/deleted/.del-rpl_row_log.test~f6ed1be9e3ca110f 2006-02-03 20:52:09 +01:00
@@ -1,4 +0,0 @@
-# Requires row base logging
--- source include/have_binlog_format_row.inc
--- source extra/rpl_tests/rpl_log.test
-
--- 1.1/mysql-test/t/rpl_row_sp001.test 2005-12-22 06:35:03 +01:00
+++ 1.2/mysql-test/t/rpl_row_sp001.test 2006-02-03 20:37:30 +01:00
@@ -85,34 +85,34 @@
INSERT INTO test.t2 VALUES(NULL,'NEW'),(NULL,'NEW'),(NULL,'NEW'),(NULL,'NEW');
-select * from test.t2;
+SELECT * FROM t2 ORDER BY a;
save_master_pos;
connection slave;
sync_with_master;
-select * from test.t2;
+SELECT * FROM t2 ORDER BY a;
connection master;
call test.p2(1);
-select * from test.t2;
+SELECT * FROM t2 ORDER BY a;
sync_slave_with_master;
-select * from test.t2;
+SELECT * FROM t2 ORDER BY a;
connection master;
call test.p2(2);
-select * from test.t2;
+SELECT * FROM t2 ORDER BY a;
save_master_pos;
connection slave;
sync_with_master;
-select * from test.t2;
+SELECT * FROM t2 ORDER BY a;
connection master;
call test.p2(3);
-select * from test.t2;
+SELECT * FROM t2 ORDER BY a;
save_master_pos;
connection slave;
sync_with_master;
-select * from test.t2;
+SELECT * FROM t2 ORDER BY a;
##Used for debugging
#show binlog events;
--- 1.7/mysql-test/r/rpl_create_database.result 2006-01-12 19:50:30 +01:00
+++ 1.8/mysql-test/r/rpl_create_database.result 2006-02-03 19:02:15 +01:00
@@ -61,16 +61,14 @@
mysqltest_prometheus
mysqltest_sisyfos
test
-SHOW CREATE TABLE mysqltest_prometheus.t1;
-Table Create Table
-t1 CREATE TABLE `t1` (
- `a` int(11) default NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
-SHOW CREATE TABLE mysqltest_sisyfos.t2;
-Table Create Table
-t2 CREATE TABLE `t2` (
- `a` int(11) default NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1
+USE mysqltest_prometheus;
+SHOW TABLES;
+Tables_in_mysqltest_prometheus
+t1
+USE mysqltest_sisyfos;
+SHOW TABLES;
+Tables_in_mysqltest_sisyfos
+t2
DROP DATABASE IF EXISTS mysqltest_prometheus;
DROP DATABASE IF EXISTS mysqltest_sisyfos;
DROP DATABASE IF EXISTS mysqltest_bob;
--- 1.5/mysql-test/t/rpl_create_database.test 2005-12-22 05:10:55 +01:00
+++ 1.6/mysql-test/t/rpl_create_database.test 2006-02-03 19:02:01 +01:00
@@ -58,8 +58,10 @@
SHOW DATABASES;
sync_slave_with_master;
SHOW DATABASES;
-SHOW CREATE TABLE mysqltest_prometheus.t1;
-SHOW CREATE TABLE mysqltest_sisyfos.t2;
+USE mysqltest_prometheus;
+SHOW TABLES;
+USE mysqltest_sisyfos;
+SHOW TABLES;
connection master;
DROP DATABASE IF EXISTS mysqltest_prometheus;
--- 1.31/mysql-test/r/rpl_replicate_do.result 2005-12-22 05:10:53 +01:00
+++ 1.32/mysql-test/r/rpl_replicate_do.result 2006-02-03 20:15:06 +01:00
@@ -16,7 +16,7 @@
update t1 set m=20 where m=16;
delete from t1 where m=17;
create table t11 select * from t1;
-select * from t1;
+select * from t1 ORDER BY m;
m
15
20
--- 1.14/mysql-test/r/rpl_redirect.result 2003-11-20 20:07:17 +01:00
+++ 1.15/mysql-test/r/rpl_redirect.result 2006-02-03 20:20:17 +01:00
@@ -12,26 +12,26 @@
create table t1 ( n int);
insert into t1 values (1),(2),(3),(4);
insert into t1 values(5);
-select * from t1;
+SELECT * FROM t1 ORDER BY n;
n
1
2
3
4
5
-select * from t1;
+SELECT * FROM t1 ORDER BY n;
n
1
2
3
4
-select * from t1;
+SELECT * FROM t1 ORDER BY n;
n
1
2
3
4
-select * from t1;
+SELECT * FROM t1 ORDER BY n;
n
1
2
--- 1.23/mysql-test/t/rpl_replicate_do.test 2005-12-22 05:10:56 +01:00
+++ 1.24/mysql-test/t/rpl_replicate_do.test 2006-02-03 20:14:56 +01:00
@@ -21,7 +21,7 @@
save_master_pos;
connection slave;
sync_with_master;
-select * from t1;
+select * from t1 ORDER BY m;
select * from t2;
--error 1146
select * from t11;
--- 1.28/mysql-test/extra/rpl_tests/rpl_log.test 2005-12-22 05:10:58 +01:00
+++ 1.29/mysql-test/extra/rpl_tests/rpl_log.test 2006-02-06 23:04:52 +01:00
@@ -30,21 +30,25 @@
connection master;
reset master;
-create table t1(n int not null auto_increment primary key);
+eval create table t1(n int not null auto_increment primary key)ENGINE=$engine_type;
insert into t1 values (NULL);
drop table t1;
-create table t1 (word char(20) not null);
+eval create table t1 (word char(20) not null)ENGINE=$engine_type;
load data infile '../../std_data/words.dat' into table t1 ignore 1 lines;
select count(*) from t1;
drop table t1;
--replace_result $VERSION VERSION
--replace_column 2 # 5 #
+--replace_regex /\/\* xid=.* \*\//\/* XID *\//
show binlog events;
--replace_column 2 # 5 #
+--replace_regex /\/\* xid=.* \*\//\/* XID *\//
show binlog events from 102 limit 1;
--replace_column 2 # 5 #
+--replace_regex /\/\* xid=.* \*\//\/* XID *\//
show binlog events from 102 limit 2;
--replace_column 2 # 5 #
+--replace_regex /\/\* xid=.* \*\//\/* XID *\//
show binlog events from 102 limit 2,1;
flush logs;
@@ -64,7 +68,7 @@
# To make it predictable, we do a useless update now, but which has the
# interest of making the slave catch both rotate events.
-create table t5 (a int);
+eval create table t5 (a int)ENGINE=$engine_type;
drop table t5;
# Sync slave and force it to start on another binary log
@@ -82,14 +86,16 @@
# Create some entries for second log
-create table t1 (n int);
+eval create table t1 (n int)ENGINE=$engine_type;
insert into t1 values (1);
drop table t1;
--replace_result $VERSION VERSION
--replace_column 2 # 5 #
+--replace_regex /\/\* xid=.* \*\//\/* XID *\//
show binlog events;
--replace_result $VERSION VERSION
--replace_column 2 # 5 #
+--replace_regex /\/\* xid=.* \*\//\/* XID *\//
show binlog events in 'master-bin.000002';
show binary logs;
save_master_pos;
@@ -99,9 +105,11 @@
show binary logs;
--replace_result $MASTER_MYPORT MASTER_PORT $VERSION VERSION
--replace_column 2 # 5 #
+--replace_regex /\/\* xid=.* \*\//\/* XID *\//
show binlog events in 'slave-bin.000001' from 4;
--replace_result $MASTER_MYPORT MASTER_PORT $VERSION VERSION
--replace_column 2 # 5 #
+--replace_regex /\/\* xid=.* \*\//\/* XID *\//
show binlog events in 'slave-bin.000002' from 4;
--replace_result $MASTER_MYPORT MASTER_PORT
--replace_column 1 # 8 # 9 # 16 # 23 # 33 #
--- 1.13/mysql-test/t/rpl_redirect.test 2005-12-22 05:10:53 +01:00
+++ 1.14/mysql-test/t/rpl_redirect.test 2006-02-03 20:20:02 +01:00
@@ -32,12 +32,12 @@
connection master;
enable_rpl_parse;
# The first of the queries will be sent to the slave, the second to the master.
-select * from t1;
-select * from t1;
+SELECT * FROM t1 ORDER BY n;
+SELECT * FROM t1 ORDER BY n;
disable_rpl_parse;
-select * from t1;
+SELECT * FROM t1 ORDER BY n;
connection slave;
-select * from t1;
+SELECT * FROM t1 ORDER BY n;
drop table t1;
connection master;
drop table t1;
| Thread |
|---|
| • bk commit into 5.1 tree (jmiller:1.2137) | Jonathan Miller | 7 Feb |
