Commit 3ddea20d authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint 

into  mysql.com:/home/tnurnberg/review/mysql-5.0-maint-20588


mysql-test/t/mysqldump.test:
  Auto merged
parents 90ff8fbd df4ba783

mysql-test/t/mysqldump.test

+1 −1
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ drop database db1; 
# BUG#15328 Segmentation fault occured if my.cnf is invalid for escape sequence

#



--exec $MYSQL_MY_PRINT_DEFAULTS --defaults-extra-file=$MYSQL_TEST_DIR/std_data/bug15328.cnf mysqldump

--exec $MYSQL_MY_PRINT_DEFAULTS --config-file=$MYSQL_TEST_DIR/std_data/bug15328.cnf mysqldump





#