Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-new (150cad66) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/r/ndb_restore.result

+15 −1

Original line number	Diff line number	Diff line
		@@ -125,6 +125,13 @@ create table t6 engine=myisam as select * from t6_c;
		create table t7 engine=myisam as select * from t7_c;
		create table t8 engine=myisam as select * from t8_c;
		create table t9 engine=myisam as select * from t9_c;
		CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP;
		DELETE FROM test.backup_info;
		LOAD DATA INFILE '../../var/tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
		SELECT @the_backup_id:=backup_id FROM test.backup_info;
		@the_backup_id:=backup_id
		<the_backup_id>
		DROP TABLE test.backup_info;
		drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;
		select count(*) from t1;
		count(*)
		@@ -241,6 +248,13 @@ PARTITION BY LINEAR HASH (`relatta`)
		PARTITIONS 4;
		ALTER TABLE t7_c
		PARTITION BY LINEAR KEY (`dardtestard`);
		CREATE TEMPORARY TABLE IF NOT EXISTS test.backup_info (id INT, backup_id INT) ENGINE = HEAP;
		DELETE FROM test.backup_info;
		LOAD DATA INFILE '../../var/tmp.dat' INTO TABLE test.backup_info FIELDS TERMINATED BY ',';
		SELECT @the_backup_id:=backup_id FROM test.backup_info;
		@the_backup_id:=backup_id
		<the_backup_id>
		DROP TABLE test.backup_info;
		drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;
		select count(*) from t1;
		count(*)
		@@ -445,4 +459,4 @@ drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;
		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 t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;
		520093696,2
		520093696,<the_backup_id>

mysql-test/t/ndb_restore.test

+10 −10

Original line number	Diff line number	Diff line
		@@ -143,10 +143,10 @@ create table t8 engine=myisam as select * from t8_c;
		create table t9 engine=myisam as select * from t9_c;


		--exec $NDB_MGM --no-defaults -e "start backup" >> $NDB_TOOLS_OUTPUT
		--source include/ndb_backup.inc
		drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;
		--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 1 -n 1 -m -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-1 >> $NDB_TOOLS_OUTPUT
		--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 1 -n 2 -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-1 >> $NDB_TOOLS_OUTPUT
		--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b $the_backup_id -n 1 -m -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT
		--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b $the_backup_id -n 2 -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT

		# random output order??
		#show tables;
		@@ -230,10 +230,10 @@ PARTITIONS 4;
		ALTER TABLE t7_c
		PARTITION BY LINEAR KEY (`dardtestard`);

		--exec $NDB_MGM --no-defaults -e "start backup" >> $NDB_TOOLS_OUTPUT
		--source include/ndb_backup.inc
		drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;
		--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 2 -n 1 -m -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-2 >> $NDB_TOOLS_OUTPUT
		--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 2 -n 2 -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-2 >> $NDB_TOOLS_OUTPUT
		--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b $the_backup_id -n 1 -m -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT
		--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b $the_backup_id -n 2 -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT

		select count(*) from t1;
		select count(*) from t1_c;
		@@ -290,8 +290,8 @@ select count(*)
		select * from t9_c) a;

		drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;
		--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 2 -n 1 -m -r --ndb-nodegroup_map '(0,0)' --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-2 >> $NDB_TOOLS_OUTPUT
		--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b 2 -n 2 -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-2 >> $NDB_TOOLS_OUTPUT
		--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b $the_backup_id -n 1 -m -r --ndb-nodegroup_map '(0,0)' --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT
		--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults -b $the_backup_id -n 2 -r --print --print_meta $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id >> $NDB_TOOLS_OUTPUT

		select count(*) from t1;
		select count(*) from t1_c;
		@@ -348,7 +348,7 @@ select count(*)
		select * from t9_c) a;

		drop table t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;
		--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --core=0 -b 2 -n 1 -m -r --ndb-nodegroup_map '(0,1)' $NDB_BACKUP_DIR/BACKUP/BACKUP-2 2>&1 \| grep Translate \|\| true
		--exec $NDB_TOOLS_DIR/ndb_restore --no-defaults --core=0 -b $the_backup_id -n 1 -m -r --ndb-nodegroup_map '(0,1)' $NDB_BACKUP_DIR/BACKUP/BACKUP-$the_backup_id 2>&1 \| grep Translate \|\| true

		#
		# Cleanup
		@@ -363,6 +363,6 @@ drop table if exists t1_c,t2_c,t3_c,t4_c,t5_c,t6_c,t7_c,t8_c,t9_c;
		# Test BUG#10287
		#

		--exec $NDB_TOOLS_DIR/ndb_select_all --no-defaults -d sys -D , SYSTAB_0 \| grep 520093696
		--exec $NDB_TOOLS_DIR/ndb_select_all --no-defaults -d sys -D , SYSTAB_0 \| grep 520093696, \| sed "s/,$the_backup_id/,<the_backup_id>/"

		# End of 4.1 tests