Fixed wrong merge

d6ebc3bb · monty@mishka.mysql.fi · 9f22a169 · d6ebc3bb
Commit d6ebc3bb authored Sep 14, 2005 by monty@mishka.mysql.fi
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

mysql-test/t/mysqldump.test mysql-test/t/mysqldump.test +2 -2

No files found.
--- a/mysql-test/t/mysqldump.test
+++ b/mysql-test/t/mysqldump.test
@@ -768,8 +768,8 @@ 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 client
--exec $MYSQL_MY_PRINT_DEFAULTS -c $MYSQL_TEST_DIR/var/tmp/tmp.cnf -e $MYSQL_TEST_DIR/var/tmp/tmp.cnf client client
+--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 mysqltest1
 --exec rm $MYSQL_TEST_DIR/var/tmp/tmp.cnf

 #