From: Mattias Jonsson Date: September 14 2010 1:15pm Subject: bzr commit into mysql-5.5-bugfixing branch (mattias.jonsson:3207) List-Archive: http://lists.mysql.com/commits/118212 Message-Id: <201009141317.o8EAhsRx007308@acsinet15.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3975898032053449178==" --===============3975898032053449178== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///Users/mattiasj/mysql-bzr/b56659-55-bf/ based on revid:tor.didriksen@stripped 3207 Mattias Jonsson 2010-09-14 test modified: client/mysqltest.cc mysql-test/suite/parts/inc/partition_check_drop.inc mysql-test/suite/parts/inc/partition_crash.inc mysql-test/suite/parts/inc/partition_fail.inc mysql-test/suite/parts/inc/partition_layout.inc mysql-test/suite/parts/inc/partition_layout_check1.inc mysql-test/suite/parts/inc/partition_layout_check2.inc mysql-test/suite/parts/r/partition_recover_myisam.result mysql-test/suite/parts/r/partition_special_myisam.result mysql-test/suite/parts/t/partition_debug_sync_innodb.test mysql-test/suite/parts/t/partition_recover_myisam.test mysql-test/suite/parts/t/partition_special_myisam.test === modified file 'client/mysqltest.cc' --- a/client/mysqltest.cc 2010-09-08 08:53:03 +0000 +++ b/client/mysqltest.cc 2010-09-14 13:15:44 +0000 @@ -447,7 +447,7 @@ struct st_command char *query, *query_buf,*first_argument,*last_argument,*end; DYNAMIC_STRING content; int first_word_len, query_len; - my_bool abort_on_error; + my_bool abort_on_error, used_replace; struct st_expected_errors expected_errors; char require_file[FN_REFLEN]; enum enum_commands type; @@ -3414,7 +3414,7 @@ static int get_list_files(DYNAMIC_STRING if (ds_wild && ds_wild->length && wild_compare(file->name, ds_wild->str, 0)) continue; - dynstr_append(ds, file->name); + replace_dynstr_append(ds, file->name); dynstr_append(ds, "\n"); } set_wild_chars(0); @@ -3444,6 +3444,7 @@ static void do_list_files(struct st_comm {"file", ARG_STRING, FALSE, &ds_wild, "Filename (incl. wildcard)"} }; DBUG_ENTER("do_list_files"); + command->used_replace= 1; check_command_args(command, command->first_argument, list_files_args, @@ -3485,6 +3486,7 @@ static void do_list_files_write_file_com {"file", ARG_STRING, FALSE, &ds_wild, "Filename (incl. wildcard)"} }; DBUG_ENTER("do_list_files_write_file"); + command->used_replace= 1; check_command_args(command, command->first_argument, list_files_args, @@ -8473,7 +8475,7 @@ int main(int argc, char **argv) memset(&saved_expected_errors, 0, sizeof(saved_expected_errors)); } - if (command_executed != last_command_executed) + if (command_executed != last_command_executed || command->used_replace) { /* As soon as any command has been executed, === modified file 'mysql-test/suite/parts/inc/partition_check_drop.inc' --- a/mysql-test/suite/parts/inc/partition_check_drop.inc 2008-08-04 05:04:47 +0000 +++ b/mysql-test/suite/parts/inc/partition_check_drop.inc 2010-09-14 13:15:44 +0000 @@ -26,10 +26,12 @@ if ($do_file_tests) { let $ls_file= $MYSQLD_DATADIR/test/tmp2; # List the files belonging to the table t1 + --replace_result $MYSQLTEST_VARDIR \$MYSQLTEST_VARDIR #p# #P# #sp# #SP# --list_files_write_file $ls_file $MYSQLD_DATADIR/test t1* --chmod 0644 $ls_file if ($with_directories) { + --replace_result $MYSQLTEST_VARDIR \$MYSQLTEST_VARDIR #p# #P# #sp# #SP# --list_files_append_file $ls_file $MYSQLTEST_VARDIR/tmp t1* } eval SET @aux = load_file('$ls_file'); @@ -60,16 +62,15 @@ if ($found_garbage) --echo # worked incomplete. --echo # We found: # Print the list of files into the protocol - eval SELECT REPLACE(file_list,'$MYSQLTEST_VARDIR','\$MYSQLTEST_VARDIR') - AS "unified filelist" + eval SELECT file_list AS "unified filelist" FROM t0_definition WHERE state = 'old'; } # Do a manual cleanup, because the following tests should not suffer from # remaining files - --exec rm -f $MYSQLD_DATADIR/test/t1* || true + --remove_files_wildcard $MYSQLD_DATADIR/test t1* if ($with_directories) { - --exec rm -f $MYSQLTEST_VARDIR/tmp/t1* || true + --remove_files_wildcard $MYSQLTEST_VARDIR/tmp t1* } } --enable_query_log === modified file 'mysql-test/suite/parts/inc/partition_crash.inc' --- a/mysql-test/suite/parts/inc/partition_crash.inc 2010-08-13 07:50:25 +0000 +++ b/mysql-test/suite/parts/inc/partition_crash.inc 2010-09-14 13:15:44 +0000 @@ -3,7 +3,7 @@ --eval $create_statement --eval $insert_statement --echo # State before crash ---replace_result #p# #P# +--replace_result #p# #P# #sp# #SP# --list_files $DATADIR/test SHOW CREATE TABLE t1; --sorted_result @@ -14,13 +14,13 @@ SELECT * FROM t1; --error 2013 --eval $crash_statement --echo # State after crash (before recovery) ---replace_regex /sqlx.*\./sqlx-nnnn_nnnn./ /#p#/#P#/ +--replace_regex /sqlx.*\./sqlx-nnnn_nnnn./ /#p#/#P#/ /#sp#/#SP#/ /#tmp#/#TMP#/ --list_files $DATADIR/test --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect --enable_reconnect --source include/wait_until_connected_again.inc --echo # State after crash recovery ---replace_result #p# #P# +--replace_result #p# #P# #sp# #SP# --list_files $DATADIR/test SHOW CREATE TABLE t1; --sorted_result === modified file 'mysql-test/suite/parts/inc/partition_fail.inc' --- a/mysql-test/suite/parts/inc/partition_fail.inc 2010-08-13 07:50:25 +0000 +++ b/mysql-test/suite/parts/inc/partition_fail.inc 2010-09-14 13:15:44 +0000 @@ -3,6 +3,7 @@ --eval $create_statement --eval $insert_statement --echo # State before failure +--replace_result #p# #P# #sp# #SP# --list_files $DATADIR/test SHOW CREATE TABLE t1; --sorted_result @@ -11,6 +12,7 @@ SELECT * FROM t1; --eval $fail_statement --enable_abort_on_error --echo # State after failure +--replace_result #p# #P# #sp# #SP# --list_files $DATADIR/test SHOW CREATE TABLE t1; --sorted_result === modified file 'mysql-test/suite/parts/inc/partition_layout.inc' --- a/mysql-test/suite/parts/inc/partition_layout.inc 2008-08-04 05:04:47 +0000 +++ b/mysql-test/suite/parts/inc/partition_layout.inc 2010-09-14 13:15:44 +0000 @@ -10,6 +10,6 @@ eval SHOW CREATE TABLE t1; if ($ls) { let $MYSQLD_DATADIR= `select @@datadir`; - --replace_result $MYSQLD_DATADIR MYSQLD_DATADIR + --replace_result $MYSQLD_DATADIR MYSQLD_DATADIR #p# #P# #sp# #SP# --list_files $MYSQLD_DATADIR/test t1* } === modified file 'mysql-test/suite/parts/inc/partition_layout_check1.inc' --- a/mysql-test/suite/parts/inc/partition_layout_check1.inc 2009-02-01 12:00:48 +0000 +++ b/mysql-test/suite/parts/inc/partition_layout_check1.inc 2010-09-14 13:15:44 +0000 @@ -69,7 +69,7 @@ if ($do_file_tests) if ($ls) { # Print the list of files into the protocol - replace_result $MYSQLD_DATADIR MYSQLD_DATADIR $MYSQLTEST_VARDIR MYSQLTEST_VARDIR; + replace_result $MYSQLD_DATADIR MYSQLD_DATADIR $MYSQLTEST_VARDIR MYSQLTEST_VARDIR #p# #P# #sp# #SP# part_n part_N; SELECT file_list AS "unified filelist" FROM t0_definition WHERE state = 'old'; } === modified file 'mysql-test/suite/parts/inc/partition_layout_check2.inc' --- a/mysql-test/suite/parts/inc/partition_layout_check2.inc 2009-02-01 12:00:48 +0000 +++ b/mysql-test/suite/parts/inc/partition_layout_check2.inc 2010-09-14 13:15:44 +0000 @@ -65,7 +65,7 @@ let $run= `SELECT @aux`; if ($run) { --vertical_results - --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR + --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR #p# #P# #sp# #SP# SELECT state, REPLACE(create_command,'\n',' ') AS "Table definition", REPLACE(file_list ,'\n',' ') AS "File list" === modified file 'mysql-test/suite/parts/r/partition_recover_myisam.result' --- a/mysql-test/suite/parts/r/partition_recover_myisam.result 2009-12-13 23:50:33 +0000 +++ b/mysql-test/suite/parts/r/partition_recover_myisam.result 2010-09-14 13:15:44 +0000 @@ -1,4 +1,4 @@ -call mtr.add_suppression("./test/t1_will_crash"); +call mtr.add_suppression("t1_will_crash"); call mtr.add_suppression("Got an error from unknown thread"); CREATE TABLE t1_will_crash (a INT, KEY (a)) ENGINE=MyISAM; INSERT INTO t1_will_crash VALUES (1), (2), (3), (4), (5), (6), (7), (8), (9), (10), (11); === modified file 'mysql-test/suite/parts/r/partition_special_myisam.result' --- a/mysql-test/suite/parts/r/partition_special_myisam.result 2010-08-13 07:50:25 +0000 +++ b/mysql-test/suite/parts/r/partition_special_myisam.result 2010-09-14 13:15:44 +0000 @@ -214,7 +214,7 @@ SET lock_wait_timeout = 2; ALTER TABLE t1 COALESCE PARTITION 2; ERROR HY000: Lock wait timeout exceeded; try restarting transaction # Connection 3 tries to load into the table: -LOAD DATA LOCAL INFILE '/tmp/load.in' INTO TABLE t1 (f); +LOAD DATA INFILE 'load.in' INTO TABLE t1 (f); # Connection 1 commits the transaction COMMIT; # Connection 3... === modified file 'mysql-test/suite/parts/t/partition_debug_sync_innodb.test' --- a/mysql-test/suite/parts/t/partition_debug_sync_innodb.test 2010-08-20 07:54:37 +0000 +++ b/mysql-test/suite/parts/t/partition_debug_sync_innodb.test 2010-09-14 13:15:44 +0000 @@ -56,6 +56,7 @@ partition by range (a) insert into t1 values (1), (11), (21), (33); SELECT * FROM t1; SHOW CREATE TABLE t1; +--replace_result #p# #P# #sp# #SP# --list_files $MYSQLD_DATADIR/test SET DEBUG_SYNC='before_open_in_get_all_tables SIGNAL parked WAIT_FOR open'; @@ -78,6 +79,7 @@ ALTER TABLE t1 REORGANIZE PARTITION p0 I disconnect con1; connection default; --reap +--replace_result #p# #P# #sp# #SP# --list_files $MYSQLD_DATADIR/test SHOW CREATE TABLE t1; SELECT * FROM t1; === modified file 'mysql-test/suite/parts/t/partition_recover_myisam.test' --- a/mysql-test/suite/parts/t/partition_recover_myisam.test 2009-12-13 23:50:33 +0000 +++ b/mysql-test/suite/parts/t/partition_recover_myisam.test 2010-09-14 13:15:44 +0000 @@ -1,6 +1,6 @@ # test the auto-recover (--myisam-recover) of partitioned myisam tables -call mtr.add_suppression("./test/t1_will_crash"); +call mtr.add_suppression("t1_will_crash"); call mtr.add_suppression("Got an error from unknown thread"); --source include/have_partition.inc === modified file 'mysql-test/suite/parts/t/partition_special_myisam.test' --- a/mysql-test/suite/parts/t/partition_special_myisam.test 2010-08-13 07:50:25 +0000 +++ b/mysql-test/suite/parts/t/partition_special_myisam.test 2010-09-14 13:15:44 +0000 @@ -62,13 +62,14 @@ ALTER TABLE t1 COALESCE PARTITION 2; --connect (con3,localhost,root,,) -perl; -open( LD, ">" . "/tmp/load.in" ) || die "Could not open file for writing " . $ENV{'MYSQLTEST_DATADIR'} . "/test/load.in"; -print LD "1\n2\n3\n"; -close( LD ); +--let $MYSQLD_DATADIR= `SELECT @@datadir` +--write_file $MYSQLD_DATADIR/test/load.in +1 +2 +3 EOF --echo # Connection 3 tries to load into the table: -send LOAD DATA LOCAL INFILE '/tmp/load.in' INTO TABLE t1 (f); +send LOAD DATA INFILE 'load.in' INTO TABLE t1 (f); --connection default --real_sleep 1 --===============3975898032053449178== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/mattias.jonsson@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: mattias.jonsson@stripped\ # 2j32p08asjpg9jh1 # target_branch: file:///Users/mattiasj/mysql-bzr/b56659-55-bf/ # testament_sha1: e5f17ef8ae3d6604357608a876e095afb54d963a # timestamp: 2010-09-14 15:15:57 +0200 # base_revision_id: tor.didriksen@stripped\ # eamj03nas42bt2e3 # # Begin bundle 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 --===============3975898032053449178==--