diff options
author | unknown <monty@mishka.mysql.fi> | 2005-09-14 04:18:38 +0300 |
---|---|---|
committer | unknown <monty@mishka.mysql.fi> | 2005-09-14 04:18:38 +0300 |
commit | 15eb2477ca55bbdf030bbc781ee01a4a9a311cac (patch) | |
tree | dfbf24e4c46e1ac3450fbc6f00048cd6a1c624bd /mysql-test/t/mysqldump.test | |
parent | 1d67ee14dfd70e4a73e6eb5eb9d87f13fc788f36 (diff) | |
parent | 97f0b6452d23e6dde0e9547fbf40a4e11d54485d (diff) | |
download | mariadb-git-15eb2477ca55bbdf030bbc781ee01a4a9a311cac.tar.gz |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mishka.mysql.fi:/home/my/mysql-5.0
mysql-test/t/mysqldump.test:
Auto merged
Diffstat (limited to 'mysql-test/t/mysqldump.test')
-rw-r--r-- | mysql-test/t/mysqldump.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/t/mysqldump.test b/mysql-test/t/mysqldump.test index aa0cf7c8469..b61998299a9 100644 --- a/mysql-test/t/mysqldump.test +++ b/mysql-test/t/mysqldump.test @@ -769,7 +769,7 @@ DROP TABLE t1, t2; --exec echo "[mysqltest1]" > $MYSQL_TEST_DIR/var/tmp/tmp.cnf --exec echo "port=1234" >> $MYSQL_TEST_DIR/var/tmp/tmp.cnf --exec $MYSQL_MY_PRINT_DEFAULTS -c $MYSQL_TEST_DIR/var/tmp/tmp.cnf mysqltest1 ---exec $MYSQL_MY_PRINT_DEFAULTS -e $MYSQL_TEST_DIR/var/tmp/tmp.cnf mysqltest1 +--exec $MYSQL_MY_PRINT_DEFAULTS -e $MYSQL_TEST_DIR/var/tmp/tmp.cnf mysqltest1 mysqltest1 --exec rm $MYSQL_TEST_DIR/var/tmp/tmp.cnf # |