1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/home/kostja/mysql/mysql-4.0-root

Browse Source 
into mysql.com:/home/kostja/mysql/mysql-4.0-1724
This commit is contained in:
unknown 2003-11-03 22:53:42 +03:00
commit bc296f9495
3 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mysql-test/r/rpl_reset_slave.result
View File

@ -20,3 +20,13 @@ start slave;
show slave status;
Master_Host Master_User Master_Port Connect_retry Master_Log_File Read_Master_Log_Pos Relay_Log_File Relay_Log_Pos Relay_Master_Log_File Slave_IO_Running Slave_SQL_Running Replicate_do_db Replicate_ignore_db Last_errno Last_error Skip_counter Exec_master_log_pos Relay_log_space
127.0.0.1 root MASTER_PORT 1 master-bin.001 79 slave-relay-bin.002 120 master-bin.001 Yes Yes 0 0 79 120
stop slave;
reset slave;
start slave;
create temporary table t1 (a int);
stop slave;
reset slave;
start slave;
show status like 'slave_open_temp_tables';
Variable_name Value
Slave_open_temp_tables 1

18
mysql-test/t/rpl_reset_slave.test
View File

@ -2,6 +2,8 @@
# --master-* options from mysqld, as this is what is going to be used next time
# slave threads will be started). In bug 985, it displayed old values (of before
# RESET SLAVE).
# See if slave crashes when doing a CREATE TEMPORARY TABLE twice, separated by
# RESET SLAVE.
source include/master-slave.inc;
connection master;
@ -24,3 +26,19 @@ start slave;
sync_with_master;
--replace_result $MASTER_MYPORT MASTER_PORT
show slave status;
# test of crash with temp tables & RESET SLAVE
# (test to see if RESET SLAVE clears temp tables in memory and disk)
stop slave;
reset slave;
start slave;
connection master;
create temporary table t1 (a int);
save_master_pos;
connection slave;
sync_with_master;
stop slave;
reset slave;
start slave;
sync_with_master;
show status like 'slave_open_temp_tables';

2
sql/slave.cc
View File

@ -337,6 +337,8 @@ void st_relay_log_info::close_temporary_tables()
*/
close_temporary(table, 0);
}
save_temporary_tables= 0;
slave_open_temp_tables= 0;
}
/*