mirror of
				https://github.com/MariaDB/server.git
				synced 2025-10-31 15:50:51 +03:00 
			
		
		
		
	- ie. backport from 5.1 - also update testcase error dected by new version mysql-test/include/show_msg.inc: BitKeeper file /home/msvensson/mysql/same_tools/my41-same_tools/mysql-test/include/show_msg.inc mysql-test/include/show_msg80.inc: BitKeeper file /home/msvensson/mysql/same_tools/my41-same_tools/mysql-test/include/show_msg80.inc BitKeeper/deleted/.del-rpl_chain_temp_table.test: Delete: mysql-test/t/rpl_chain_temp_table.test BitKeeper/deleted/.del-rpl_chain_temp_table.result: Delete: mysql-test/r/rpl_chain_temp_table.result BitKeeper/deleted/.del-rpl_failsafe.result: Delete: mysql-test/r/rpl_failsafe.result BitKeeper/deleted/.del-rpl_failsafe.test: Delete: mysql-test/t/rpl_failsafe.test BitKeeper/deleted/.del-rpl_heap.test: Delete: mysql-test/t/rpl_heap.test BitKeeper/deleted/.del-rpl_heap.result: Delete: mysql-test/r/rpl_heap.result BitKeeper/deleted/.del-rpl000018.result: Delete: mysql-test/r/rpl000018.result BitKeeper/deleted/.del-rpl000018.test: Delete: mysql-test/t/rpl000018.test client/Makefile.am: Link mysqltest with mysys/my_copy.c client/mysqltest.c: Update mysqltest to latest version mysql-test/include/have_multi_ndb.inc: Remove old syntax "@filename" in favor of "--require filename" mysql-test/include/master-slave.inc: Remove old syntax "@filename" in favor of "--require filename" mysql-test/include/ps_query.inc: Remove the comment about no output now when it does. mysql-test/r/check.result: Update output from --send mysql-test/r/connect.result: Update result file for connect test after backport form 5.1 mysql-test/r/flush.result: Update output from --send mysql-test/r/flush_block_commit.result: Update output from --send mysql-test/r/func_misc.result: Update output from --send mysql-test/r/grant2.result: Update output from --send mysql-test/r/handler.result: Update output from --send mysql-test/r/kill.result: Update output from --send mysql-test/r/lock_multi.result: Update output from --send mysql-test/r/mix_innodb_myisam_binlog.result: Update output from --send mysql-test/r/mysqltest.result: Update mysqltest.result after backport mysql-test/r/ps_2myisam.result: Update result as the output from query is now printed mysql-test/r/ps_3innodb.result: Update result as the output from query is now printed mysql-test/r/ps_4heap.result: Update result as the output from query is now printed mysql-test/r/ps_5merge.result: Update result as the output from query is now printed mysql-test/r/ps_6bdb.result: Update result as the output from query is now printed mysql-test/r/ps_7ndb.result: Update result as the output from query is now printed mysql-test/r/rename.result: Update output from --send mysql-test/r/rpl000001.result: Update output from --send mysql-test/r/rpl_error_ignored_table.result: Update output from --send mysql-test/r/rpl_master_pos_wait.result: Update output from --send mysql-test/r/subselect.result: Update result file after adding missing ; mysql-test/r/synchronization.result: Update output from --send mysql-test/r/type_blob.result: Update result file after adding missing ; mysql-test/t/connect.test: Backport test from 5.1 mysql-test/t/init_file.test: Update test so something is printed mysql-test/t/mysql_client_test.test: Update test so result is sent to file and something is printed mysql-test/t/mysqltest.test: Backport latest mysqltest.test file mysql-test/t/ps.test: Move the --replace_column statement to just before the statetement it should replace mysql-test/t/ps_1general.test: Move the --replace_column statement to just before the statetement it should replace mysql-test/t/ps_grant.test: Remove the $DB, no other test uses it mysql-test/t/rpl_flush_tables.test: Fetch $SERVER_VERSION from the db server mysql-test/t/rpl_trunc_temp.test: Remove the selection of connection master after it's been disconnected already mysql-test/t/subselect.test: Add missing ; mysql-test/t/type_blob.test: Add missing ;
		
			
				
	
	
		
			53 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			53 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
| #
 | |
| # Test of replicating FLUSH TABLES to make
 | |
| # RENAME TABLE work with MERGE tables on the slave.
 | |
| # Test of FLUSH NO_WRITE_TO_BINLOG by the way.
 | |
| #
 | |
| --source include/master-slave.inc
 | |
| # Skipped on Windows because it can't handle a table underlying an open
 | |
| # merge table getting renamed.
 | |
| --source include/not_windows.inc
 | |
| 
 | |
| let $SERVER_VERSION=`select version()`;
 | |
| 
 | |
| create table t1 (a int);
 | |
| insert into t1 values (10);
 | |
| create table t2 (a int);
 | |
| create table t3 (a int) engine=merge union(t1);
 | |
| create table t4 (a int);
 | |
| # We force the slave to open t3 (because we want to try confusing him) with this :
 | |
| insert into t4 select * from t3;
 | |
| rename table t1 to t5, t2 to t1;
 | |
| # RENAME may have confused the master (this is a known bug): so FLUSH tables,
 | |
| # first don't write it to the binlog, to test the NO_WRITE_TO_BINLOG keyword.
 | |
| flush no_write_to_binlog tables;
 | |
| # Check that it's not in the binlog.
 | |
| --replace_result $SERVER_VERSION SERVER_VERSION
 | |
| show binlog events;
 | |
| # Check that the master is not confused.
 | |
| select * from t3;
 | |
| # This FLUSH should go into the binlog to not confuse the slave.
 | |
| flush tables;
 | |
| # Check that it's in the binlog.
 | |
| --replace_result $SERVER_VERSION SERVER_VERSION
 | |
| show binlog events;
 | |
| save_master_pos;
 | |
| connection slave;
 | |
| sync_with_master;
 | |
| # Check that the slave is not confused.
 | |
| select * from t3;
 | |
| # Note that all this confusion may cause warnings 'table xx is open on rename'
 | |
| # in the .err files; these are not fatal and are not reported by mysql-test-run.
 | |
| 
 | |
| stop slave;
 | |
| connection master;
 | |
| drop table t1;
 | |
| connection slave;
 | |
| flush tables with read lock;
 | |
| start slave;
 | |
| sleep 1;
 | |
| --error 1192
 | |
| stop slave;
 | |
| 
 | |
| # End of 4.1 tests
 |