From: Mattias Jonsson
Date: September 14 2010 10:48am
Subject: bzr commit into mysql-5.5-bugfixing branch (mattias.jonsson:3207)
List-Archive: http://lists.mysql.com/commits/118178
Message-Id: <201009141050.o8EAhsNt007310@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============9043716655081405711=="

--===============9043716655081405711==
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_fail.inc
      mysql-test/suite/parts/inc/partition_layout_check1.inc
      mysql-test/suite/parts/t/partition_debug_sync_innodb.test
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2010-09-08 08:53:03 +0000
+++ b/client/mysqltest.cc	2010-09-14 10:48:21 +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 10:48:21 +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 #            <alter partitioning> 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_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 10:48:21 +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_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 10:48:21 +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/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 10:48:21 +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;


--===============9043716655081405711==
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\
#   o3o2uilnfwfntqas
# target_branch: file:///Users/mattiasj/mysql-bzr/b56659-55-bf/
# testament_sha1: 761894937479eb4b3a90b14c909e2f180ac895d3
# timestamp: 2010-09-14 12:48:36 +0200
# base_revision_id: tor.didriksen@stripped\
#   eamj03nas42bt2e3
# 
# Begin bundle
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


--===============9043716655081405711==--