Commit 738a1ca0 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/bkroot/mysql-5.1-new 

into  mysql.com:/home/bk/w3023-mysql-5.1-new


mysql-test/extra/binlog_tests/ctype_cp932.test:
  Auto merged
mysql-test/r/binlog_row_blackhole.result:
  Auto merged
mysql-test/r/binlog_stm_ctype_cp932.result:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log.cc:
  Auto merged
sql/log.h:
  Auto merged
sql/log_event.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/opt_range.cc:
  Auto merged
sql/parse_file.cc:
  Auto merged
sql/slave.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_class.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/table.h:
  Auto merged
sql/log_event.cc:
  Merge with mysql-5.1-new
parents 13adc06f 41f7d138

mysql-test/extra/binlog_tests/ctype_cp932.test

+4 −0
Original line number Diff line number Diff line
@@ -434,4 +434,8 @@ insert into t1 values ('ab'); 
select * from t1;

insert into t1 values ('abc');

select * from t1;

--disable_query_log

--disable_warnings

drop table t1;

--enable_warnings

--enable_query_log

mysql-test/r/binlog_row_blackhole.result

+12 −0
Original line number Diff line number Diff line
@@ -118,6 +118,12 @@ master-bin.000001 # Query 1 # use `test`; COMMIT 
master-bin.000001	#	Table_map	1	#	test.t1

master-bin.000001	#	Write_rows	1	#	

master-bin.000001	#	Query	1	#	use `test`; COMMIT

master-bin.000001	#	Table_map	1	#	test.t1

master-bin.000001	#	Write_rows	1	#	

master-bin.000001	#	Query	1	#	use `test`; COMMIT

master-bin.000001	#	Table_map	1	#	test.t1

master-bin.000001	#	Write_rows	1	#	

master-bin.000001	#	Query	1	#	use `test`; COMMIT

master-bin.000001	#	Query	1	#	use `test`; create table t2 (a varchar(200)) engine=blackhole

master-bin.000001	#	Table_map	1	#	test.t2

master-bin.000001	#	Write_rows	1	#
@@ -125,6 +131,12 @@ master-bin.000001 # Query 1 # use `test`; COMMIT 
master-bin.000001	#	Query	1	#	use `test`; alter table t1 add b int

master-bin.000001	#	Query	1	#	use `test`; alter table t1 drop b

master-bin.000001	#	Query	1	#	use `test`; create table t3 like t1

master-bin.000001	#	Table_map	1	#	test.t1

master-bin.000001	#	Write_rows	1	#	

master-bin.000001	#	Query	1	#	use `test`; COMMIT

master-bin.000001	#	Table_map	1	#	test.t1

master-bin.000001	#	Write_rows	1	#	

master-bin.000001	#	Query	1	#	use `test`; COMMIT

drop table t1,t2,t3;

reset master;

create table t1 (a int) engine=blackhole;

mysql-test/r/binlog_row_mix_innodb_myisam.result

+21 −17
Original line number Diff line number Diff line
@@ -262,22 +262,26 @@ master-bin.000001 209 Write_rows 1 # 
master-bin.000001	243	Table_map	1	#	test.t1

master-bin.000001	282	Write_rows	1	#	

master-bin.000001	316	Xid	1	#	COMMIT /* xid= */

master-bin.000001	343	Query	1	#	use `test`; delete from t1

master-bin.000001	420	Xid	1	#	COMMIT /* xid= */

master-bin.000001	447	Query	1	#	use `test`; delete from t2

master-bin.000001	524	Xid	1	#	COMMIT /* xid= */

master-bin.000001	551	Query	1	#	use `test`; alter table t2 type=MyISAM

master-bin.000001	640	Table_map	1	#	test.t1

master-bin.000001	679	Write_rows	1	#	

master-bin.000001	713	Xid	1	#	COMMIT /* xid= */

master-bin.000001	740	Table_map	1	#	test.t2

master-bin.000001	779	Write_rows	1	#	

master-bin.000001	813	Query	1	#	use `test`; drop table t1,t2

master-bin.000001	892	Query	1	#	use `test`; create table t0 (n int)

master-bin.000001	978	Table_map	1	#	test.t0

master-bin.000001	1017	Write_rows	1	#	

master-bin.000001	1051	Table_map	1	#	test.t0

master-bin.000001	1090	Write_rows	1	#	

master-bin.000001	1124	Query	1	#	use `test`; create table t2 (n int) engine=innodb

master-bin.000001	343	Table_map	1	#	test.t1

master-bin.000001	382	Query	1	#	use `test`; delete from t1

master-bin.000001	459	Xid	1	#	COMMIT /* xid= */

master-bin.000001	486	Table_map	1	#	test.t2

master-bin.000001	525	Query	1	#	use `test`; delete from t2

master-bin.000001	602	Xid	1	#	COMMIT /* xid= */

master-bin.000001	629	Query	1	#	use `test`; alter table t2 type=MyISAM

master-bin.000001	718	Table_map	1	#	test.t1

master-bin.000001	757	Write_rows	1	#	

master-bin.000001	791	Xid	1	#	COMMIT /* xid= */

master-bin.000001	818	Query	1	#	use `test`; BEGIN

master-bin.000001	886	Table_map	1	#	test.t1

master-bin.000001	925	Write_rows	1	#	

master-bin.000001	954	Xid	1	#	COMMIT /* xid= */

master-bin.000001	981	Query	1	#	use `test`; drop table t1,t2

master-bin.000001	1060	Query	1	#	use `test`; create table t0 (n int)

master-bin.000001	1146	Table_map	1	#	test.t0

master-bin.000001	1185	Write_rows	1	#	

master-bin.000001	1219	Table_map	1	#	test.t0

master-bin.000001	1258	Write_rows	1	#	

master-bin.000001	1292	Query	1	#	use `test`; create table t2 (n int) engine=innodb

do release_lock("lock1");

drop table t0,t2;

mysql-test/r/binlog_stm_ctype_cp932.result

+0 −1
Original line number Diff line number Diff line
@@ -11366,4 +11366,3 @@ col1 
a

a

a
 
drop table t1;

mysql-test/r/rpl_row_charset.result

+10 −0
Original line number Diff line number Diff line
@@ -112,10 +112,16 @@ drop database mysqltest3; 
show binlog events from 102;

Log_name	Pos	Event_type	Server_id	End_log_pos	Info

master-bin.000001	#	Query	1	#	drop database if exists mysqltest2

master-bin.000001	#	Table_map	1	#	mysql.proc

master-bin.000001	#	Write_rows	1	#	

master-bin.000001	#	Query	1	#	drop database if exists mysqltest3

master-bin.000001	#	Table_map	1	#	mysql.proc

master-bin.000001	#	Write_rows	1	#	

master-bin.000001	#	Query	1	#	create database mysqltest2 character set latin2

master-bin.000001	#	Query	1	#	create database mysqltest3

master-bin.000001	#	Query	1	#	drop database mysqltest3

master-bin.000001	#	Table_map	1	#	mysql.proc

master-bin.000001	#	Write_rows	1	#	

master-bin.000001	#	Query	1	#	create database mysqltest3

master-bin.000001	#	Query	1	#	use `mysqltest2`; create table t1 (a int auto_increment primary key, b varchar(100))

master-bin.000001	#	Table_map	1	#	mysqltest2.t1
@@ -141,7 +147,11 @@ master-bin.000001 # Query 1 # use `mysqltest2`; truncate table t1 
master-bin.000001	#	Table_map	1	#	mysqltest2.t1

master-bin.000001	#	Write_rows	1	#	

master-bin.000001	#	Query	1	#	drop database mysqltest2

master-bin.000001	#	Table_map	1	#	mysql.proc

master-bin.000001	#	Write_rows	1	#	

master-bin.000001	#	Query	1	#	drop database mysqltest3

master-bin.000001	#	Table_map	1	#	mysql.proc

master-bin.000001	#	Write_rows	1	#	

select "--- --global--" as "";



--- --global--