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

--===============6877341151148011320==
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:19:50 +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:19:50 +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:19:50 +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:19:50 +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#;
       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:19:50 +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;


--===============6877341151148011320==
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\
#   8jx25pm16ssdptan
# target_branch: file:///Users/mattiasj/mysql-bzr/b56659-55-bf/
# testament_sha1: 261c2715ef600fce17d0e1b28b68cde229c4f034
# timestamp: 2010-09-14 12:20:00 +0200
# base_revision_id: tor.didriksen@stripped\
#   eamj03nas42bt2e3
# 
# Begin bundle
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
08DVS13isI5FTY4Fmh+vf+LuSKcKEhmjkQ0g


--===============6877341151148011320==--