Merge mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new (fbb5bfc1) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/include/rpl_multi_engine3.inc

+3 −1

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ INSERT INTO t1 VALUES(412,1,'Testing MySQL databases is a cool ',
		select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;

		sync_slave_with_master;
		--sleep 5
		--echo --- Select from t1 on slave ---
		select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;

		@@ -41,9 +42,9 @@ SELECT id,hex(b1),vc,bc,d,f,total,y,t FROM t1 WHERE id = 412;

		# Must give injector thread a little time to get update
		# into the binlog other wise we will miss the update.
		sleep 10;

		sync_slave_with_master;
		--sleep 5
		--echo --- Check Update on slave ---
		SELECT id,hex(b1),vc,bc,d,f,total,y,t FROM t1 WHERE id = 412;

		@@ -55,6 +56,7 @@ DELETE FROM t1 WHERE id = 42;
		SELECT COUNT(*) FROM t1;

		sync_slave_with_master;
		--sleep 5
		--echo --- Show current count on slave for t1 ---
		SELECT COUNT(*) FROM t1;

mysql-test/mysql-test-run.pl

+23 −5

Original line number	Diff line number	Diff line
		@@ -321,6 +321,8 @@ our $opt_with_ndbcluster_slave;
		our $opt_with_ndbcluster_all= 0;
		our $opt_with_ndbcluster_only= 0;
		our $opt_ndb_extra_test= 0;
		our $opt_skip_master_binlog= 0;
		our $opt_skip_slave_binlog= 0;

		our $exe_ndb_mgm;
		our $path_ndb_tools_dir;
		@@ -599,6 +601,8 @@ sub command_line_setup () {
		'with-ndbcluster-all' => \$opt_with_ndbcluster_all,
		'with-ndbcluster-only' => \$opt_with_ndbcluster_only,
		'ndb-extra-test' => \$opt_ndb_extra_test,
		'skip-master-binlog' => \$opt_skip_master_binlog,
		'skip-slave-binlog' => \$opt_skip_slave_binlog,
		'do-test=s' => \$opt_do_test,
		'start-from=s' => \$opt_start_from,
		'suite=s' => \$opt_suite,
		@@ -2157,6 +2161,14 @@ sub run_testcase ($) {
		if ( $using_ndbcluster_master and ! $master->[1]->{'pid'} )
		{
		# Test needs cluster, start an extra mysqld connected to cluster
		# First wait for first mysql server to have created ndb system tables ok
		if ( ! sleep_until_file_created("$master->[0]->{'path_myddir'}/cluster/apply_status.ndb",
		$master->[0]->{'start_timeout'},
		$master->[0]->{'pid'}))
		{
		report_failure_and_restart($tinfo);
		return;
		}
		mtr_tofile($master->[1]->{'path_myerr'},"CURRENT_TEST: $tname\n");
		$master->[1]->{'pid'}=
		mysqld_start('master',1,$tinfo->{'master_opt'},[],
		@@ -2555,8 +2567,11 @@ sub mysqld_arguments ($$$$$$) {
		{
		my $id= $idx > 0 ? $idx + 101 : 1;

		if (! $opt_skip_master_binlog)
		{
		mtr_add_arg($args, "%s--log-bin=%s/log/master-bin%s", $prefix,
		$opt_vardir, $sidx);
		}
		mtr_add_arg($args, "%s--pid-file=%s", $prefix,
		$master->[$idx]->{'path_mypid'});
		mtr_add_arg($args, "%s--port=%d", $prefix,
		@@ -2597,9 +2612,12 @@ sub mysqld_arguments ($$$$$$) {
		# FIXME slave get this option twice?!
		mtr_add_arg($args, "%s--exit-info=256", $prefix);
		mtr_add_arg($args, "%s--init-rpl-role=slave", $prefix);
		if (! $opt_skip_slave_binlog)
		{
		mtr_add_arg($args, "%s--log-bin=%s/log/slave%s-bin", $prefix,
		$opt_vardir, $sidx); # FIXME use own dir for binlogs
		mtr_add_arg($args, "%s--log-slave-updates", $prefix);
		}
		# FIXME option duplicated for slave
		mtr_add_arg($args, "%s--log=%s", $prefix,
		$slave->[$idx]->{'path_mylog'});

mysql-test/r/ndb_restore.result

+113 −0

Original line number	Diff line number	Diff line
		@@ -467,3 +467,116 @@ Create table test/def/t2_c failed: Translate frm error
		drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
		drop table if exists t2_c;
		520093696,<the_backup_id>
		DROP DATABASE IF EXISTS BANK;
		CREATE DATABASE BANK default charset=latin1 default collate=latin1_bin;
		USE BANK;
		SHOW TABLES;
		Tables_in_BANK
		ACCOUNT
		GL
		ACCOUNT_TYPE
		TRANSACTION
		SYSTEM_VALUES
		SELECT * FROM GL ORDER BY TIME,ACCOUNT_TYPE;
		TIME ACCOUNT_TYPE BALANCE DEPOSIT_COUNT DEPOSIT_SUM WITHDRAWAL_COUNT WITHDRAWAL_SUM PURGED
		0 0 10000000 0 0 0 0 1
		0 1 30000 0 0 0 0 1
		0 2 20000 0 0 0 0 1
		0 3 20000 0 0 0 0 1
		0 4 20000 0 0 0 0 1
		1 0 10000000 0 0 0 0 1
		1 1 30000 0 0 0 0 1
		1 2 20000 0 0 0 0 1
		1 3 20000 0 0 0 0 1
		1 4 20000 0 0 0 0 1
		2 0 9857062 54 225197 76 368135 1
		2 1 60601 174 822920 181 792319 1
		2 2 68832 117 531214 98 482382 1
		2 3 83550 106 521953 104 458403 1
		2 4 19955 118 532084 110 532129 1
		3 0 9732896 62 289563 88 413729 1
		3 1 51056 202 895888 193 905433 0
		3 2 67183 122 596787 127 598436 1
		3 3 97669 159 761743 141 747624 1
		3 4 141196 140 727808 136 606567 1
		4 0 9616621 138 603930 142 720205 0
		4 1 178927 348 1741521 344 1613650 0
		4 2 52141 236 1169929 232 1184971 0
		4 3 48938 228 1147957 244 1196688 0
		4 4 193373 246 1257982 234 1205805 0
		5 0 9515281 156 726253 166 827593 0
		5 1 253798 597 2840640 545 2765769 0
		5 2 102776 362 1821680 364 1771045 0
		5 3 87349 359 1778652 375 1740241 0
		5 4 130796 351 1727448 375 1790025 0
		SELECT * FROM ACCOUNT ORDER BY ACCOUNT_ID;
		ACCOUNT_ID OWNER BALANCE ACCOUNT_TYPE
		0 0 9531306 0
		1 3001 123844 1
		2 3002 30800 2
		3 3003 3133 3
		4 3004 6524 4
		5 3005 80152 1
		6 3006 107390 1
		7 3007 69448 2
		8 3008 663 3
		9 3009 136740 4
		SELECT COUNT(*) FROM TRANSACTION;
		COUNT(*)
		6649
		SELECT * FROM SYSTEM_VALUES ORDER BY SYSTEM_VALUES_ID;
		SYSTEM_VALUES_ID VALUE
		0 4767
		1 6
		TRUNCATE GL;
		TRUNCATE ACCOUNT;
		TRUNCATE TRANSACTION;
		TRUNCATE SYSTEM_VALUES;
		TRUNCATE ACCOUNT_TYPE;
		SELECT * FROM GL ORDER BY TIME,ACCOUNT_TYPE;
		TIME ACCOUNT_TYPE BALANCE DEPOSIT_COUNT DEPOSIT_SUM WITHDRAWAL_COUNT WITHDRAWAL_SUM PURGED
		0 0 10000000 0 0 0 0 1
		0 1 30000 0 0 0 0 1
		0 2 20000 0 0 0 0 1
		0 3 20000 0 0 0 0 1
		0 4 20000 0 0 0 0 1
		1 0 10000000 0 0 0 0 1
		1 1 30000 0 0 0 0 1
		1 2 20000 0 0 0 0 1
		1 3 20000 0 0 0 0 1
		1 4 20000 0 0 0 0 1
		2 0 10000000 0 0 0 0 1
		2 1 30000 0 0 0 0 1
		2 2 20000 0 0 0 0 1
		2 3 20000 0 0 0 0 1
		2 4 20000 0 0 0 0 1
		3 0 9963591 14 59111 19 95520 0
		3 1 44264 49 255559 53 241295 0
		3 2 25515 39 177806 36 172291 0
		3 3 16779 26 129200 29 132421 0
		3 4 39851 43 182771 34 162920 0
		4 0 9733661 141 632616 162 862546 0
		4 1 63853 426 2005337 415 1985748 0
		4 2 140473 314 1548632 297 1433674 0
		4 3 13481 310 1528043 324 1531341 0
		4 4 138532 316 1540206 309 1441525 0
		SELECT * FROM ACCOUNT ORDER BY ACCOUNT_ID;
		ACCOUNT_ID OWNER BALANCE ACCOUNT_TYPE
		0 0 9679579 0
		1 3001 18130 1
		2 3002 12318 2
		3 3003 3049 3
		4 3004 39517 4
		5 3005 37051 1
		6 3006 144497 1
		7 3007 130670 2
		8 3008 13747 3
		9 3009 11442 4
		SELECT COUNT(*) FROM TRANSACTION;
		COUNT(*)
		4056
		SELECT * FROM SYSTEM_VALUES ORDER BY SYSTEM_VALUES_ID;
		SYSTEM_VALUES_ID VALUE
		0 2297
		1 5
		DROP DATABASE BANK;

mysql-test/r/rpl_ndb_2innodb.result

0 → 100644

+855 −0

File added.

Preview size limit exceeded, changes collapsed.

mysql-test/r/rpl_ndb_2myisam.result

0 → 100644

+855 −0

File added.

Preview size limit exceeded, changes collapsed.