Commit 90125bbe authored by unknown's avatar unknown
Browse files

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  mysql.com:/home/mysql_src/mysql-5.1-new
parents 777165cc c6622b3a

mysql-test/mysql-test-run.pl

+1 −1
Original line number Diff line number Diff line
@@ -2561,7 +2561,7 @@ sub mysqld_arguments ($$$$$$) { 
    mtr_add_arg($args, "%s--server-id=%d", $prefix, $id);

    mtr_add_arg($args, "%s--socket=%s", $prefix,

                $master->[$idx]->{'path_mysock'});

    mtr_add_arg($args, "%s--innodb_data_file_path=ibdata1:128M:autoextend", $prefix);

    mtr_add_arg($args, "%s--innodb_data_file_path=ibdata1:10M:autoextend", $prefix);

    mtr_add_arg($args, "%s--local-infile", $prefix);

    mtr_add_arg($args, "%s--datadir=%s", $prefix,

                $master->[$idx]->{'path_myddir'});