Commit 5c602713 authored by unknown's avatar unknown
Browse files

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

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


client/Makefile.am:
  Auto merged
parents 7afaea74 81a4074b

client/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -95,7 +95,8 @@ DEFS = -DUNDEF_THREADS_HACK \ 
			-DDEFAULT_MYSQL_HOME="\"$(prefix)\"" \

			-DDATADIR="\"$(localstatedir)\""



sql_src=log_event.h mysql_priv.h log_event.cc my_decimal.h my_decimal.cc

sql_src=log_event.h mysql_priv.h rpl_constants.h \

	log_event.cc my_decimal.h my_decimal.cc

strings_src=decimal.c



link_sources:

mysql-test/extra/binlog_tests/binlog.test

+4 −8
Original line number Diff line number Diff line
@@ -20,9 +20,7 @@ begin; 
insert t2 values (5);

commit;

# first COMMIT must be Query_log_event, second - Xid_log_event

--replace_column 2 # 5 #

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

show binlog events from 105;

source include/show_binlog_events.inc;

drop table t1,t2;



#
@@ -44,10 +42,10 @@ commit; 
drop table t1;

--replace_column 2 # 5 #

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

show binlog events in 'master-bin.000001' from 105;

show binlog events in 'master-bin.000001' from 106;

--replace_column 2 # 5 #

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

show binlog events in 'master-bin.000002' from 105;

show binlog events in 'master-bin.000002' from 106;



# Test of a too big SET INSERT_ID: see if the truncated value goes

# into binlog (right), or the too big value (wrong); we look at the
@@ -80,9 +78,7 @@ DELETE FROM user WHERE host='localhost' AND user='@#@'; 
--enable_warnings



use test;

--replace_column 2 # 5 #

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

show binlog events from 105;

source include/show_binlog_events.inc;

drop table t1,t2,t3,tt1;



-- source extra/binlog_tests/binlog_insert_delayed.test

mysql-test/extra/binlog_tests/binlog_insert_delayed.test

+1 −3
Original line number Diff line number Diff line
@@ -23,9 +23,7 @@ inc $count; 
# moving binlog check affront of multi-rows queries which work is indeterministic (extra table_maps)

# todo: better check is to substitute SHOW BINLOG with reading from binlog, probably bug#19459 is in

# the way

--replace_column 2 # 5 #

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

show binlog events from 105;

source include/show_binlog_events.inc;



insert delayed into t1 values (null),(null),(null),(null);

inc $count; inc $count; inc $count; inc $count;

mysql-test/extra/binlog_tests/ctype_cp932_binlog.test

+1 −3
Original line number Diff line number Diff line
@@ -26,9 +26,7 @@ SET @var1= x'8300'; 
# code (and I have used it to test the fix) until there is some way to

# exercise this code from mysql-test-run.

EXECUTE stmt1 USING @var1;

--replace_column 2 # 5 #

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

SHOW BINLOG EVENTS FROM 105;

source include/show_binlog_events.inc;

SELECT HEX(f1) FROM t1;

DROP table t1;

# end test for bug#11338

mysql-test/extra/binlog_tests/ctype_ucs_binlog.test

+1 −2
Original line number Diff line number Diff line
@@ -9,8 +9,7 @@ create table t2 (c char(30)) charset=ucs2; 
set @v=convert('abc' using ucs2);

reset master;

insert into t2 values (@v);

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

show binlog events from 105;

source include/show_binlog_events.inc;

# more important than SHOW BINLOG EVENTS, mysqlbinlog (where we

# absolutely need variables names to be quoted and strings to be

# escaped).