diff options
| author | unknown <joreland@mysql.com> | 2005-06-07 10:50:27 +0200 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-06-07 10:50:27 +0200 |
| commit | e37db41fed13f044917b1f262e5533e5d62bb9c0 (patch) | |
| tree | a4d3f67f8605866eb8c07f60229a4785be7f445c /mysql-test/t | |
| parent | 7a6c62a107b961d2713cbd3ec56e11652920f45b (diff) | |
| parent | a59dee6c91628e14524837e2d2b53eac5bb7d54d (diff) | |
| download | mariadb-git-e37db41fed13f044917b1f262e5533e5d62bb9c0.tar.gz | |
Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0
configure.in:
Auto merged
libmysqld/Makefile.am:
Auto merged
strings/ctype-big5.c:
Auto merged
strings/ctype-ucs2.c:
Auto merged
Diffstat (limited to 'mysql-test/t')
| -rw-r--r-- | mysql-test/t/ndb_restore.test | 2 |
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 |