diff options
| author | unknown <joreland@mysql.com> | 2005-02-03 17:04:27 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-02-03 17:04:27 +0100 |
| commit | e7c3dc943ca9acd18e47d76501b1a1c904cc0c57 (patch) | |
| tree | e550721c77c3ecdd22156c02ec5f65c71c170f3a /mysql-test/t/ndb_autodiscover.test | |
| parent | 4090963b807c7956c3ae0764a749609eda0e1c40 (diff) | |
| parent | 2e132a8ac821dc0e2c941b1dc2490931eae9509b (diff) | |
| download | mariadb-git-e7c3dc943ca9acd18e47d76501b1a1c904cc0c57.tar.gz | |
merge
configure.in:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/t/ndb_autodiscover.test:
Auto merged
mysql-test/t/ndb_restore.test:
Auto merged
ndb/src/kernel/blocks/dbacc/DbaccMain.cpp:
Auto merged
ndb/test/include/HugoOperations.hpp:
Auto merged
ndb/test/include/NDBT_Test.hpp:
Auto merged
ndb/include/ndbapi/NdbTransaction.hpp:
Auto merged
ndb/test/src/NDBT_Test.cpp:
Auto merged
Diffstat (limited to 'mysql-test/t/ndb_autodiscover.test')
| -rw-r--r-- | mysql-test/t/ndb_autodiscover.test | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysql-test/t/ndb_autodiscover.test b/mysql-test/t/ndb_autodiscover.test index 713aa326e4d..d305c1a9dd7 100644 --- a/mysql-test/t/ndb_autodiscover.test +++ b/mysql-test/t/ndb_autodiscover.test @@ -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 --no-defaults -d test t4 > /dev/null ; +system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t4 >> $NDB_TOOLS_OUTPUT ; # # 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 --no-defaults -d test t4 > /dev/null ; +system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t4 >> $NDB_TOOLS_OUTPUT ; 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 --no-defaults -d test t3 > /dev/null ; -system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t5 > /dev/null ; +system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t3 >> $NDB_TOOLS_OUTPUT ; +system exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test t5 >> $NDB_TOOLS_OUTPUT ; # 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 ; @@ -498,4 +498,4 @@ create table t10 ( insert into t10 values (1, 'kalle'); ---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 +--exec $NDB_TOOLS_DIR/ndb_drop_table --no-defaults -d test `$NDB_TOOLS_DIR/ndb_show_tables --no-defaults | grep BLOB` >> $NDB_TOOLS_OUTPUT 2>&1 || true |