mirror of
				https://github.com/MariaDB/server.git
				synced 2025-10-31 15:50:51 +03:00 
			
		
		
		
	(Includes merge of arena code in 4.1 and 5.0) BitKeeper/etc/ignore: auto-union BitKeeper/etc/logging_ok: auto-union VC++Files/sql/mysqld.dsp: Auto merged client/mysql.cc: Auto merged client/mysqltest.c: Auto merged include/my_global.h: Auto merged include/my_sys.h: Auto merged include/mysql.h: Auto merged include/mysql_com.h: Auto merged innobase/row/row0sel.c: Auto merged libmysql/client_settings.h: Auto merged libmysql/libmysql.c: Auto merged libmysqld/Makefile.am: Auto merged libmysqld/examples/Makefile.am: Auto merged libmysqld/lib_sql.cc: Auto merged myisam/mi_check.c: Auto merged myisam/myisamchk.c: Auto merged myisam/sort.c: Auto merged mysql-test/r/connect.result: Auto merged mysql-test/r/ctype_recoding.result: Auto merged mysql-test/r/ctype_ucs.result: Auto merged mysql-test/r/func_in.result: Auto merged mysql-test/r/func_like.result: Auto merged mysql-test/r/gis.result: Auto merged mysql-test/r/having.result: Auto merged mysql-test/r/heap.result: Auto merged mysql-test/r/join.result: Auto merged mysql-test/r/key.result: Auto merged mysql-test/r/lowercase_table.result: Auto merged mysql-test/r/ndb_autodiscover.result: Auto merged mysql-test/r/null.result: Auto merged mysql-test/r/olap.result: Auto merged mysql-test/r/order_by.result: Auto merged mysql-test/r/ps_1general.result: Auto merged mysql-test/r/ps_2myisam.result: Auto merged mysql-test/r/ps_3innodb.result: Auto merged mysql-test/r/ps_4heap.result: Auto merged mysql-test/r/ps_5merge.result: Auto merged mysql-test/r/ps_6bdb.result: Auto merged mysql-test/r/range.result: Auto merged mysql-test/r/rename.result: Auto merged mysql-test/r/show_check.result: Auto merged mysql-test/r/subselect.result: Auto merged mysql-test/r/union.result: Auto merged mysql-test/r/variables.result: Auto merged mysql-test/t/alter_table.test: Auto merged mysql-test/t/null.test: Auto merged mysql-test/t/ps_1general.test: Auto merged mysql-test/t/rpl_charset.test: Auto merged mysql-test/t/rpl_heap.test: Auto merged mysql-test/t/rpl_relayrotate.test: Auto merged mysql-test/t/subselect.test: Auto merged mysql-test/t/variables.test: Auto merged netware/mysql_test_run.c: Auto merged scripts/make_binary_distribution.sh: Auto merged scripts/mysql_create_system_tables.sh: Auto merged scripts/mysql_fix_privilege_tables.sql: Auto merged scripts/mysql_install_db.sh: Auto merged sql/ha_berkeley.cc: Auto merged sql/ha_innodb.cc: Auto merged sql/ha_innodb.h: Auto merged sql/ha_myisam.cc: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/item.h: Auto merged sql/item_cmpfunc.h: Auto merged sql/item_create.cc: Auto merged sql/item_create.h: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/item_timefunc.cc: Auto merged sql/item_timefunc.h: Auto merged sql/lex.h: Auto merged sql/lock.cc: Auto merged sql/log_event.cc: Auto merged sql/mysql_priv.h: Auto merged sql/opt_sum.cc: Auto merged sql/protocol.cc: Auto merged sql/records.cc: Auto merged sql/repl_failsafe.cc: Auto merged sql/set_var.cc: Auto merged sql/set_var.h: Auto merged sql/slave.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_acl.h: Auto merged sql/sql_db.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_list.h: Auto merged sql/sql_load.cc: Auto merged sql/sql_rename.cc: Auto merged sql/sql_select.h: Auto merged sql/sql_show.cc: Auto merged sql/sql_string.h: Auto merged sql/table.cc: Auto merged sql-common/client.c: Auto merged client/mysqlbinlog.cc: Merge with 4.1 configure.in: Merge with 4.1 include/mysqld_error.h: Add new error message (1) from 4.1 mysql-test/mysql-test-run.sh: Merge with 4.1 mysql-test/r/func_gconcat.result: Merge with 4.1 mysql-test/r/func_if.result: Merge with 4.1 mysql-test/r/grant.result: Merge with 4.1 mysql-test/r/join_outer.result: Merge with 4.1 mysql-test/r/rpl_charset.result: Merge with 4.1 (This has to be fixed before pushing) mysql-test/r/system_mysql_db.result: Merge with 4.1. Added collation to new privileges mysql-test/t/grant.test: Merge with 4.1 mysql-test/t/grant_cache.test: Merge with 4.1 mysql-test/t/show_check.test: Merge with 4.1 sql/Makefile.am: Merge with 4.1 sql/item.cc: Merge with 4.1 sql/item_cmpfunc.cc: Merge with 4.1 (arena code) sql/item_subselect.cc: Merge with 4.1 sql/item_subselect.h: Merge with 4.1 sql/item_sum.cc: Merge with 4.1 sql/item_sum.h: Merge with 4.1 sql/log.cc: Merge with 4.1 (Remove code that is not relevant for 5.0) sql/mysqld.cc: Merge with 4.1 sql/opt_range.cc: Merge with 4.1 sql/share/czech/errmsg.txt: Merge with 4.1 sql/share/danish/errmsg.txt: Merge with 4.1 sql/share/dutch/errmsg.txt: Merge with 4.1 sql/share/english/errmsg.txt: Merge with 4.1 sql/share/estonian/errmsg.txt: Merge with 4.1 sql/share/french/errmsg.txt: Merge with 4.1 sql/share/german/errmsg.txt: Merge with 4.1 sql/share/greek/errmsg.txt: Merge with 4.1 sql/share/hungarian/errmsg.txt: Merge with 4.1 sql/share/italian/errmsg.txt: Merge with 4.1 sql/share/japanese/errmsg.txt: Merge with 4.1 sql/share/korean/errmsg.txt: Merge with 4.1 sql/share/norwegian-ny/errmsg.txt: Merge with 4.1 sql/share/norwegian/errmsg.txt: Merge with 4.1 sql/share/polish/errmsg.txt: Merge with 4.1 sql/share/portuguese/errmsg.txt: Merge with 4.1 sql/share/romanian/errmsg.txt: Merge with 4.1 sql/share/russian/errmsg.txt: Merge with 4.1 sql/share/serbian/errmsg.txt: Merge with 4.1 sql/share/slovak/errmsg.txt: Merge with 4.1 sql/share/spanish/errmsg.txt: Merge with 4.1 sql/share/swedish/errmsg.txt: Merge with 4.1 sql/share/ukrainian/errmsg.txt: Merge with 4.1 sql/sql_base.cc: Merge with 4.1 sql/sql_class.cc: Merge with 4.1 Use arena code from 4.1 sql/sql_class.h: Merge with 4.1 Use arena code from 4.1 sql/sql_derived.cc: Merge with 4.1 sql/sql_lex.cc: Merge with 4.1 sql/sql_lex.h: Merge with 4.1 sql/sql_parse.cc: Merge with 4.1 sql/sql_prepare.cc: Merge with 4.1 sql/sql_select.cc: Merge with 4.1 sql/sql_table.cc: Merge with 4.1 sql/sql_union.cc: Merge with 4.1 sql/sql_yacc.yy: Merge with 4.1 sql/tztime.cc: Merge with 4.1 tests/client_test.c: Merge with 4.1
		
			
				
	
	
		
			78 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			78 lines
		
	
	
		
			2.6 KiB
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
| # When the relay log gets rotated while the I/O thread
 | |
| # is reading a transaction, the transaction spans on two or more
 | |
| # relay logs. If STOP SLAVE occurs while the SQL thread is
 | |
| # executing a part of the transaction in the non-first relay logs,
 | |
| # we test if START SLAVE will resume in the beginning of the
 | |
| # transaction (i.e., step back to the first relay log)
 | |
|   
 | |
| # The slave is started with max_binlog_size=16384 bytes,
 | |
| # to force many rotations (approximately 30 rotations)
 | |
| 
 | |
| source include/have_innodb.inc;
 | |
| source include/master-slave.inc;
 | |
| connection slave;
 | |
| stop slave;
 | |
| connection master;
 | |
| --disable_warnings
 | |
| create table t1 (a int) engine=innodb;
 | |
| --enable_warnings
 | |
| let $1=8000;
 | |
| disable_query_log;
 | |
| begin;
 | |
| while ($1)
 | |
| {
 | |
| # eval means expand $ expressions
 | |
|  eval insert into t1 values( $1 );
 | |
|  dec $1;
 | |
| }
 | |
| commit;
 | |
| # This will generate a 500kB master's binlog,
 | |
| # which corresponds to 30 slave's relay logs.
 | |
| enable_query_log;
 | |
| save_master_pos;
 | |
| connection slave;
 | |
| reset slave;
 | |
| start slave;
 | |
| # We wait 1 sec for the SQL thread to be somewhere in
 | |
| # the middle of the transaction, hopefully not in
 | |
| # the first relay log, and hopefully before the COMMIT.
 | |
| # Usually it stops when the SQL thread is around the 15th relay log.
 | |
| # We cannot use MASTER_POS_WAIT() as master's position
 | |
| # increases only when the slave executes the COMMIT.
 | |
| # Note that except when using Valgrind, 1 second is enough for the I/O slave
 | |
| # thread to fetch the whole master's binlog.
 | |
| sleep 1;
 | |
| stop slave;
 | |
| # We suppose the SQL thread stopped before COMMIT.
 | |
| # If so the transaction was rolled back
 | |
| # and the table is now empty.
 | |
| # Now restart
 | |
| start slave;
 | |
| # And see if the table contains '8000'
 | |
| # which proves that the transaction restarted at
 | |
| # the right place.
 | |
| # We must wait for the transaction to commit before
 | |
| # reading, MASTER_POS_WAIT() will do it for sure
 | |
| # (the only statement with position>=3000 is COMMIT).
 | |
| select master_pos_wait('master-bin.001',3000)>=0;
 | |
| select max(a) from t1;
 | |
| --replace_column 1 # 8 # 9 # 23 # 33 #
 | |
| --replace_result $MASTER_MYPORT MASTER_MYPORT
 | |
| show slave status;
 | |
| connection master;
 | |
| 
 | |
| # The following DROP is a very important cleaning task:
 | |
| # imagine the next test is run with --skip-innodb: it will do
 | |
| # DROP TABLE IF EXISTS t1; but this will delete the frm and leave
 | |
| # some data in the InnoDB datafile (because at that time mysqld
 | |
| # does not know about InnoDB : --skip-innodb). So if later in the
 | |
| # test suite a test wants to create an InnoDB table called t1, it
 | |
| # will fail with 
 | |
| # InnoDB: Error: table t1 already exists in InnoDB internal
 | |
| # InnoDB: data dictionary. Have you deleted the .frm file etc
 | |
| drop table t1;
 | |
| # wait until this drop is executed on slave
 | |
| save_master_pos;
 | |
| connection slave;
 | |
| sync_with_master;
 |