diff options
author | unknown <joerg@trift2.> | 2008-02-22 16:14:27 +0100 |
---|---|---|
committer | unknown <joerg@trift2.> | 2008-02-22 16:14:27 +0100 |
commit | 50ba314c983ad0a3f9c4853e87f1436bf56e8d8a (patch) | |
tree | c34960a8d8c55cea599ef88af042bbf2ecd8baca /mysql-test/suite/stress | |
parent | a7341383efb1cbdf163488ab1562d15bae263718 (diff) | |
parent | 9dfc925db0db97f20a561d976bd9c2c40917600a (diff) | |
download | mariadb-git-50ba314c983ad0a3f9c4853e87f1436bf56e8d8a.tar.gz |
Merge trift2.:/MySQL/M51/mysql-5.1
into trift2.:/MySQL/M51/push-5.1
configure.in:
Auto merged
extra/yassl/src/handshake.cpp:
Auto merged
extra/yassl/src/template_instnt.cpp:
Auto merged
extra/yassl/src/yassl_imp.cpp:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
sql/ha_ndbcluster_binlog.cc:
Auto merged
sql/handler.cc:
Auto merged
sql/log_event.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_class.cc:
Auto merged
storage/ndb/src/common/util/OutputStream.cpp:
Auto merged
storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp:
Auto merged
storage/ndb/tools/waiter.cpp:
Auto merged
Diffstat (limited to 'mysql-test/suite/stress')
-rw-r--r-- | mysql-test/suite/stress/t/ddl_ndb.test | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/suite/stress/t/ddl_ndb.test b/mysql-test/suite/stress/t/ddl_ndb.test index 7eb45da8739..1e0a3680f8a 100644 --- a/mysql-test/suite/stress/t/ddl_ndb.test +++ b/mysql-test/suite/stress/t/ddl_ndb.test @@ -10,6 +10,8 @@ # Storage engine to be used in CREATE TABLE --source include/have_ndb.inc +connection default; + let $engine_type= NDB; |