diff options
| author | unknown <tomas@mc05.(none)> | 2004-05-27 11:36:08 +0200 |
|---|---|---|
| committer | unknown <tomas@mc05.(none)> | 2004-05-27 11:36:08 +0200 |
| commit | 94fc67f54f415d6cd8b522dd864d6d9a3490b342 (patch) | |
| tree | 78e85ac6079dc7f0d586305baeb9f0f017ab009b /mysql-test | |
| parent | daaa3def140628cb36db33d9803711eb05959f6b (diff) | |
| parent | aa6ff1cf682437d3e083bc25617fdc57d3a149d3 (diff) | |
| download | mariadb-git-94fc67f54f415d6cd8b522dd864d6d9a3490b342.tar.gz | |
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into mc05.(none):/space2/tomas/mysql-4.1-ndb-test
BitKeeper/etc/logging_ok:
auto-union
configure.in:
Auto merged
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/t/ndb_minmax.test | 1 | ||||
| -rw-r--r-- | mysql-test/t/rpl_relayspace-slave.opt | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/t/ndb_minmax.test b/mysql-test/t/ndb_minmax.test index 1fa76488f5d..3be193ce602 100644 --- a/mysql-test/t/ndb_minmax.test +++ b/mysql-test/t/ndb_minmax.test @@ -1,3 +1,4 @@ +-- source include/have_ndb.inc --disable_warnings drop table if exists t1, t2; diff --git a/mysql-test/t/rpl_relayspace-slave.opt b/mysql-test/t/rpl_relayspace-slave.opt index 05cb01731d2..06d96aa3b9a 100644 --- a/mysql-test/t/rpl_relayspace-slave.opt +++ b/mysql-test/t/rpl_relayspace-slave.opt @@ -1 +1 @@ - -O relay_log_space_limit=10
\ No newline at end of file +--relay_log_space_limit=10 |