added --no-defaults to ndb_drop_table in autodiscover test (a2aa366e) · Commits · Software / OSDI20 Artifacts / mariadb

mysql-test/t/ndb_autodiscover.test

+7 −7

Original line number	Diff line number	Diff line
		@@ -199,7 +199,7 @@ insert into t4 values (1, "Automatic");
		select * from t4;

		# Remove the table from NDB
		system exec $NDB_TOOLS_DIR/ndb_drop_table -d test t4 > /dev/null ;
		system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t4 > /dev/null ;

		#
		# Test that correct error is returned
		@@ -230,7 +230,7 @@ select * from t4;
		flush tables;

		# Remove the table from NDB
		system exec $NDB_TOOLS_DIR/ndb_drop_table -d test t4 > /dev/null ;
		system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t4 > /dev/null ;

		SHOW TABLES;

		@@ -264,8 +264,8 @@ insert into t8 values (8, "myisam table 8");
		insert into t9 values (9);

		# Remove t3, t5 from NDB
		system exec $NDB_TOOLS_DIR/ndb_drop_table -d test t3 > /dev/null ;
		system exec $NDB_TOOLS_DIR/ndb_drop_table -d test t5 > /dev/null ;
		system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t3 > /dev/null ;
		system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t5 > /dev/null ;
		# Remove t6, t7 from disk
		system rm var/master-data/test/t6.frm > /dev/null ;
		system rm var/master-data/test/t7.frm > /dev/null ;
		@@ -306,8 +306,8 @@ insert into t8 values (8, "myisam table 8");
		insert into t9 values (9);

		# Remove t3, t5 from NDB
		system exec $NDB_TOOLS_DIR/ndb_drop_table -d test t3 > /dev/null ;
		system exec $NDB_TOOLS_DIR/ndb_drop_table -d test t5 > /dev/null ;
		system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t3 > /dev/null ;
		system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t5 > /dev/null ;
		# Remove t6, t7 from disk
		system rm var/master-data/test/t6.frm > /dev/null ;
		system rm var/master-data/test/t7.frm > /dev/null ;
		@@ -479,4 +479,4 @@ create table t10 (

		insert into t10 values (1, 'kalle');

		--exec $NDB_TOOLS_DIR/ndb_drop_table -d test `$NDB_TOOLS_DIR/ndb_show_tables \| grep BLOB` > /dev/null 2>&1 \|\| true
		--exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test `$NDB_TOOLS_DIR/ndb_show_tables --no-defaults \| grep BLOB` > /dev/null 2>&1 \|\| true