diff options
| author | unknown <msvensson@pilot.mysql.com> | 2008-02-21 14:11:01 +0100 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2008-02-21 14:11:01 +0100 |
| commit | 996e34fd9eddb2b47c161ac52716b38422fe2cdb (patch) | |
| tree | 9e78087b1ec08720ea8715f842544d4a447072dc /mysql-test/suite/ndb_team | |
| parent | b4e1e5e5dc79e1345520a468ca0198af6cc06c63 (diff) | |
| parent | ae1eaff2d4bb064fb7685a3fd0060c812fa3d201 (diff) | |
| download | mariadb-git-996e34fd9eddb2b47c161ac52716b38422fe2cdb.tar.gz | |
Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-build
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-build
mysql-test/suite/ndb_team/t/ndb_autodiscover.test:
Auto merged
sql/sql_parse.cc:
Auto merged
mysql-test/suite/ndb_team/t/ndb_autodiscover3.test:
Manual merge, use already existing way in 5.1
Diffstat (limited to 'mysql-test/suite/ndb_team')
| -rw-r--r-- | mysql-test/suite/ndb_team/t/ndb_autodiscover.test | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/suite/ndb_team/t/ndb_autodiscover.test b/mysql-test/suite/ndb_team/t/ndb_autodiscover.test index 06d47693c10..e25bf4518a8 100644 --- a/mysql-test/suite/ndb_team/t/ndb_autodiscover.test +++ b/mysql-test/suite/ndb_team/t/ndb_autodiscover.test @@ -491,6 +491,7 @@ select * from t1; select * from t1; --exec $NDB_MGM --no-defaults -e "all start" > /dev/null --exec $NDB_TOOLS_DIR/ndb_waiter --no-defaults > /dev/null +--source include/ndb_wait_connected.inc use test; drop database test_only_ndb_tables; |