database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

manual merge use local

Browse Source
This commit is contained in:
unknown
2006-04-23 12:32:41 +03:00
parent a9edb4b3fb
commit c80bff65a1
2 changed files with 2959 additions and 905 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
mysql-test/t/rpl_temporary.test
View File

@ -82,6 +82,7 @@ drop temporary table t3;
select * from t2; select * from t2;
--replace_result $VERSION VERSION --replace_result $VERSION VERSION
--replace_column 2 # 5 #
show binlog events; show binlog events;
drop table t1, t2; drop table t1, t2;
@ -129,31 +130,30 @@ create temporary table t3 (f int);
sync_with_master; sync_with_master;
# #
# BUG#17263 incorrect generation DROP temp tables # Bug#17284 erroneous temp table cleanup on slave
# Temporary tables of connection are dropped in batches
# where a batch correspond to pseudo_thread_id
# value was set up at the moment of temp table creation
# #
connection con1;
set @session.pseudo_thread_id=100;
create temporary table t101 (id int);
create temporary table t102 (id int);
set @session.pseudo_thread_id=200;
create temporary table t201 (id int);
create temporary table `#not_user_table_prefixed_with_hash_sign_no_harm` (id int);
set @con1_id=connection_id();
kill @con1_id;
#now do something to show that slave is ok after DROP temp tables
connection master; connection master;
create table t1(f int); create temporary table t4 (f int);
insert into t1 values (1); create table t5 (f int);
sync_with_master;
# find dumper's $id
source include/get_binlog_dump_thread_id.inc;
insert into t4 values (1);
# a hint how to do that in 5.1
--replace_result $id "`select id from information_schema.processlist where command='Binlog Dump'`"
eval kill $id; # to stimulate reconnection by slave w/o timeout
insert into t5 select * from t4;
save_master_pos;
sync_slave_with_master; connection slave;
#connection slave; sync_with_master;
select * from t1 /* must be 1 */; select * from t5 /* must be 1 after reconnection */;
connection master; connection master;
drop table t1; drop temporary table t4;
drop table t5;
# End of 4.1 tests # The server will now close done
# End of 5.0 tests

3820
sql/sql_base.cc
View File

File diff suppressed because it is too large Load Diff