diff options
| author | unknown <brian@zim.(none)> | 2006-08-14 21:26:33 -0700 |
|---|---|---|
| committer | unknown <brian@zim.(none)> | 2006-08-14 21:26:33 -0700 |
| commit | 882b770734c08e0e1ba1017a77bc053a481d9bec (patch) | |
| tree | 04925bd2f6ab329ac9b036249ab7f3ffb6d5ca08 /mysql-test/t/bdb-alter-table-2-master.opt | |
| parent | 7260fd704970478e9ee658c3c14e76923648edd6 (diff) | |
| parent | c235176ed12788a2ec292062dd33700e80fe6b0e (diff) | |
| download | mariadb-git-882b770734c08e0e1ba1017a77bc053a481d9bec.tar.gz | |
Merge zim.(none):/home/brian/mysql/dep-5.1
into zim.(none):/home/brian/mysql/remove-bdb-5.1
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/backup.result:
Auto merged
mysql-test/r/im_utils.result:
Auto merged
mysql-test/r/show_check.result:
Auto merged
mysql-test/t/disabled.def:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
sql/field.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql-common/my_time.c:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/t/federated_transactions.test:
Merge
Diffstat (limited to 'mysql-test/t/bdb-alter-table-2-master.opt')
| -rw-r--r-- | mysql-test/t/bdb-alter-table-2-master.opt | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/t/bdb-alter-table-2-master.opt b/mysql-test/t/bdb-alter-table-2-master.opt deleted file mode 100644 index 15ad73c500f..00000000000 --- a/mysql-test/t/bdb-alter-table-2-master.opt +++ /dev/null @@ -1,2 +0,0 @@ ---skip-external-locking - |