Commit e97832df authored by unknown's avatar unknown
Browse files

Merge mysql.com:/users/lthalmann/bkroot/mysql-5.1-new 

into  mysql.com:/users/lthalmann/bk/mysql-5.1-new
parents f0e0e5c5 42cffe06

mysql-test/r/binlog_stm_binlog.result

+12 −0
Original line number Diff line number Diff line 
create table t1 (a int, b int) engine=innodb;

begin;

insert into t1 values (1,2);

commit;

show binlog events;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	4	Format_desc	1	102	Server ver: 5.1.7-beta-debug-log, Binlog ver: 4

master-bin.000001	102	Query	1	209	use `test`; create table t1 (a int, b int) engine=innodb

master-bin.000001	209	Query	1	277	use `test`; BEGIN

master-bin.000001	277	Query	1	90	use `test`; insert into t1 values (1,2)

master-bin.000001	367	Xid	1	394	COMMIT /* XID */

drop table t1;

drop table if exists t1, t2;

reset master;

create table t1 (a int) engine=bdb;

mysql-test/r/mysqltest.result

+8 −0
Original line number Diff line number Diff line
@@ -439,3 +439,11 @@ mysqltest: At line 1: Error parsing replace_regex "a " 
mysqltest: At line 1: Error parsing replace_regex "a b"

mysqltest: At line 1: Error parsing replace_regex "/a b c"

mysqltest: At line 1: Error parsing replace_regex "/a /b c "

create table t1 (a int, b int);

insert into t1 values (1,3);

insert into t1 values (2,4);

select * from t1;

a	D

1	1

1	4

drop table t1;

mysql-test/t/binlog_stm_binlog.test

+12 −0
Original line number Diff line number Diff line 
# REQUIREMENT

#   replace_regex should replace output of SHOW BINLOG EVENTS



create table t1 (a int, b int) engine=innodb;

begin;

insert into t1 values (1,2);

commit;

--replace_regex /\/\* xid=.* \*\//\/* XID *\//

show binlog events;

drop table t1;



# This is a wrapper for binlog.test so that the same test case can be used 

# For both statement and row based bin logs 9/19/2005 [jbm]



-- source include/not_embedded.inc

-- source include/have_binlog_format_statement.inc

-- source extra/binlog_tests/binlog.test

mysql-test/t/mysqltest.test

+10 −0
Original line number Diff line number Diff line
@@ -1094,3 +1094,13 @@ select "strawberry","blueberry","potato"; 
--exec echo "--replace_regex /a b c" | $MYSQL_TEST 2>&1

--error 1

--exec echo "replace_regex /a /b c ;" | $MYSQL_TEST 2>&1 



# REQUIREMENT

#   replace_regex should replace substitutions from left to right in output



create table t1 (a int, b int);

insert into t1 values (1,3);

insert into t1 values (2,4);

--replace_regex /A/C/ /B/D/i /3/2/ /2/1/

select * from t1;

drop table t1;