Commit 98398075 authored by unknown's avatar unknown
Browse files

Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-new-rpl 

into  whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user


client/Makefile.am:
  Auto merged
mysql-test/r/rpl_ndb_basic.result:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
parents 4c669601 5dcc9f9e

mysql-test/extra/binlog_tests/blackhole.test

+2 −9
Original line number Diff line number Diff line
@@ -121,11 +121,7 @@ select * from t2; 
select * from t3;



let $VERSION=`select version()`;

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/

show binlog events;



source include/show_binlog_events.inc;

drop table t1,t2,t3;



#
@@ -157,10 +153,7 @@ start transaction; 
insert into t1 values(2);

rollback;

set autocommit=1;

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/

show binlog events;

source include/show_binlog_events.inc;

drop table if exists t1;



# End of 5.0 tests

mysql-test/extra/binlog_tests/drop_temp_table.test

+1 −4
Original line number Diff line number Diff line
@@ -23,10 +23,7 @@ connection con2; 
# To be sure that logging has been done, we use a user lock.

select get_lock("a",10);

let $VERSION=`select version()`;

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

--replace_regex /table_id: [0-9]+/table_id: #/

show binlog events;

source include/show_binlog_events.inc;

drop database `drop-temp+table-test`;



# End of 4.1 tests

mysql-test/extra/binlog_tests/insert_select-binlog.test

+2 −6
Original line number Diff line number Diff line
@@ -18,9 +18,7 @@ insert into t1 select * from t2; 
# The above should produce an error, but still be in the binlog;

# verify the binlog :

let $VERSION=`select version()`;

--replace_result $VERSION VERSION

--replace_regex /table_id: [0-9]+/table_id: #/

show binlog events;

source include/show_binlog_events.inc;

select * from t1;

drop table t1, t2;
@@ -33,9 +31,7 @@ reset master; 
create table t2(unique(a)) select a from t1;

# The above should produce an error, *and* not appear in the binlog

let $VERSION=`select version()`;

--replace_result $VERSION VERSION

--replace_regex /table_id: [0-9]+/table_id: #/

show binlog events;

source include/show_binlog_events.inc;

drop table t1;



# End of 4.1 tests

mysql-test/extra/rpl_tests/rpl_ddl.test

+249 −146

File changed.

Preview size limit exceeded, changes collapsed.

mysql-test/extra/rpl_tests/rpl_log.test

+2 −8
Original line number Diff line number Diff line
@@ -88,10 +88,7 @@ connection master; 


eval create table t2 (n int)ENGINE=$engine_type;

insert into t2 values (1);

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/

show binlog events;

source include/show_binlog_events.inc;

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/
@@ -142,10 +139,7 @@ insert into t1 values (NULL, 1); 
reset master;

set insert_id=5;

insert into t1 values (NULL, last_insert_id()), (NULL, last_insert_id());

--replace_result $VERSION VERSION

--replace_column 2 # 5 #

--replace_regex /\/\* xid=.* \*\//\/* XID *\// /table_id: [0-9]+/table_id: #/

show binlog events;

source include/show_binlog_events.inc;

select * from t1;

drop table t1;