summaryrefslogtreecommitdiff
path: root/mysql-test/t
diff options
context:
space:
mode:
authorunknown <joreland@mysql.com>2005-05-24 16:50:01 +0200
committerunknown <joreland@mysql.com>2005-05-24 16:50:01 +0200
commit1cd245917b01029bff2027bcc218a25d4e4d1bad (patch)
tree2a756da9c07fe108c4cbf6b7b42a487bc2a9aab8 /mysql-test/t
parent0966289fa69df47735700fdb159f99b1f7183759 (diff)
parent77b83ce69a98717b1b354ea7cb062b16a68282d8 (diff)
downloadmariadb-git-1cd245917b01029bff2027bcc218a25d4e4d1bad.tar.gz
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0 mysql-test/t/ndb_restore.test: Auto merged
Diffstat (limited to 'mysql-test/t')
-rw-r--r--mysql-test/t/ndb_restore.test2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/ndb_restore.test b/mysql-test/t/ndb_restore.test
index 3c7b99da25a..0173fabd46f 100644
--- a/mysql-test/t/ndb_restore.test
+++ b/mysql-test/t/ndb_restore.test
@@ -214,4 +214,4 @@ 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 -d sys -D , SYSTAB_0 | grep 520093696
+--exec $NDB_TOOLS_DIR/ndb_select_all --no-defaults -d sys -D , SYSTAB_0 | grep 520093696