Commit 41f7d138 authored by unknown's avatar unknown
Browse files

WL#3023 (Use locks in a statement-like manner): 

  Table maps are now written on aquiring locks to tables and released
  at the end of each logical statement.


mysql-test/extra/binlog_tests/ctype_cp932.test:
  Disabling cleanup code
mysql-test/r/binlog_row_blackhole.result:
  Result change
mysql-test/r/binlog_row_mix_innodb_myisam.result:
  Result change
mysql-test/r/binlog_stm_ctype_cp932.result:
  Result change
mysql-test/r/rpl_row_charset.result:
  Result change
mysql-test/r/rpl_row_create_table.result:
  Result change
mysql-test/t/rpl_row_create_table.test:
  Binlog position change
sql/handler.cc:
  Writing table map after external_lock()
sql/handler.h:
  Adding class for table operation hooks.
sql/log.cc:
  Adding binlog_write_table_map() to THD.
  Removing write_table_map() from MYSQL_LOG.
sql/log.h:
  Minor interface changes to move table map writing.
sql/log_event.cc:
  Removing pre-allocation of memory for buffers.
  Allowing ULONG_MAX as table id denoting an event to ignore (only used to transfer flags).
  Adding code to collect tables while seeing table maps and lock collected tables
  when seeing a binrow event.
  Debriding code as a result of the above changes.
sql/log_event.h:
  Minor interface changes.
sql/mysql_priv.h:
  Adding hooks argument to create_table_from_items().
sql/parse_file.cc:
  Minor fix to avoid crash in debug printout.
sql/rpl_rli.h:
  Adding list of tables to lock to RLI structure.
sql/slave.cc:
  Using list of tables to lock from RLI structure.
sql/sql_acl.cc:
  Removing redundant pending events flush.
sql/sql_base.cc:
  Moving pending event flush.
  Using flag to guard to clear statement transaction only if this is the original
  open tables state.
sql/sql_class.cc:
  Adding flag for open tables state.
  Removing redundant pending events flushes.
  Write a dummy event to indicate that the tables to lock should be emptied
  on the slave.
sql/sql_class.h:
  Adding open tables state flags.
  Adding binlog_write_table_map() function to THD.
  Changes to select_create() to support new locking scheme.
sql/sql_insert.cc:
  Adding rollback of statement transaction on error. It can now contain
  events after locking tables.
sql/sql_load.cc:
  Removing redundant pending event flush.
sql/sql_table.cc:
  Adding hooks argument to create_table_from_items().
  Calling prelock hook before starting to lock tables.
sql/sql_update.cc:
  Removing a compiler warning.
sql/table.h:
  Minor changes.
parent a89c10fd

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--