List:Commits« Previous MessageNext Message »
From:kevin.lewis Date:June 11 2012 1:47am
Subject:bzr push into mysql-trunk branch (kevin.lewis:3983 to 3984)
View as plain text  
 3984 kevin.lewis@stripped	2012-06-10
      Added a slightly edited version of innodb-wl5980-windows back into the patch.

    added:
      mysql-test/suite/innodb/r/innodb-wl5980-windows.result
      mysql-test/suite/innodb/t/innodb-wl5980-windows.test
      mysql-test/suite/innodb/t/portability_wl5980_windows.zip
 3983 kevin.lewis@stripped	2012-06-09
      Full 5980 commit to current mysql-trunk.
      Added fix for second crash to problem 13 and a better fix for the
      leftover t1.ibt file from innodb-index-online.test.  This was a
      bug in the function fil_delete_file() that was added with 5522.
      Did not add the new innodb-wl5980-windows because it does not
      unzip on my Windows box.  But it does seem to run on pushbuild.
      On my Windows it says;
      'unzip' is not recognized as an internal or external command

    added:
      mysql-test/include/shutdown_mysqld.inc
      mysql-test/include/start_mysqld.inc
      mysql-test/r/partition_innodb_tablespace.result
      mysql-test/suite/innodb/r/innodb-multiple-tablespaces.result
      mysql-test/suite/innodb/r/innodb-tablespace.result
      mysql-test/suite/innodb/r/innodb-wl5980-debug.result
      mysql-test/suite/innodb/r/innodb-wl5980-discard.result
      mysql-test/suite/innodb/r/innodb-wl5980-linux.result
      mysql-test/suite/innodb/t/innodb-multiple-tablespaces.test
      mysql-test/suite/innodb/t/innodb-tablespace.test
      mysql-test/suite/innodb/t/innodb-wl5980-debug.test
      mysql-test/suite/innodb/t/innodb-wl5980-discard.test
      mysql-test/suite/innodb/t/innodb-wl5980-linux.test
      mysql-test/suite/innodb/t/portability_wl5980_linux.zip
      mysql-test/suite/parts/r/partition_reorganize_innodb.result
      mysql-test/suite/parts/r/partition_reorganize_myisam.result
      mysql-test/suite/parts/t/partition_reorganize_innodb.test
      mysql-test/suite/parts/t/partition_reorganize_myisam.test
      mysql-test/t/partition_innodb_tablespace.test
    modified:
      include/my_base.h
      mysql-test/r/mysqlshow.result
      mysql-test/suite/innodb/r/innodb-alter-discard.result
      mysql-test/suite/innodb/r/innodb-restart.result
      mysql-test/suite/innodb/r/innodb-system-table-view.result
      mysql-test/suite/innodb/r/innodb_16k.result
      mysql-test/suite/innodb/r/innodb_4k.result
      mysql-test/suite/innodb/r/innodb_8k.result
      mysql-test/suite/innodb/r/innodb_bug60049.result
      mysql-test/suite/innodb/t/innodb-alter-discard.test
      mysql-test/suite/innodb/t/innodb-restart.test
      mysql-test/suite/innodb/t/innodb-system-table-view.test
      mysql-test/suite/innodb/t/innodb_16k.test
      mysql-test/suite/innodb/t/innodb_4k.test
      mysql-test/suite/innodb/t/innodb_8k.test
      mysql-test/suite/parts/r/partition_basic_symlink_innodb.result
      mysql-test/suite/parts/t/partition_basic_symlink_innodb.test
      mysys/my_handler_errors.h
      sql/ha_partition.cc
      sql/ha_partition.h
      sql/handler.cc
      sql/sql_partition.cc
      sql/sql_partition.h
      sql/sql_table.cc
      storage/innobase/dict/dict0boot.cc
      storage/innobase/dict/dict0crea.cc
      storage/innobase/dict/dict0dict.cc
      storage/innobase/dict/dict0load.cc
      storage/innobase/fil/fil0fil.cc
      storage/innobase/fts/fts0fts.cc
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/handler/ha_innodb.h
      storage/innobase/handler/handler0alter.cc
      storage/innobase/handler/i_s.cc
      storage/innobase/handler/i_s.h
      storage/innobase/include/db0err.h
      storage/innobase/include/dict0boot.h
      storage/innobase/include/dict0crea.h
      storage/innobase/include/dict0dict.h
      storage/innobase/include/dict0dict.ic
      storage/innobase/include/dict0load.h
      storage/innobase/include/dict0mem.h
      storage/innobase/include/fil0fil.h
      storage/innobase/include/fsp0fsp.h
      storage/innobase/include/fsp0fsp.ic
      storage/innobase/include/os0file.h
      storage/innobase/include/row0merge.h
      storage/innobase/include/row0mysql.h
      storage/innobase/include/srv0start.h
      storage/innobase/lock/lock0lock.cc
      storage/innobase/os/os0file.cc
      storage/innobase/pars/pars0pars.cc
      storage/innobase/row/row0import.cc
      storage/innobase/row/row0merge.cc
      storage/innobase/row/row0mysql.cc
      storage/innobase/row/row0quiesce.cc
      storage/innobase/srv/srv0start.cc
      storage/innobase/trx/trx0rec.cc
      storage/innobase/ut/ut0ut.cc
=== added file 'mysql-test/suite/innodb/r/innodb-wl5980-windows.result'
--- a/mysql-test/suite/innodb/r/innodb-wl5980-windows.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/innodb/r/innodb-wl5980-windows.result	revid:kevin.lewis@stripped
@@ -0,0 +1,163 @@
+#set the environmental variables
+# Stop server
+# Copy the Remote tablespace & DB zip files from suite location to working location
+# unzip the Zip file.
+# Remove the DOS based *.ISL files from the MySql Data directory
+#check for the *.ibd files are in the required location
+#Modify the path in the *.ISL files, for *.ibd files, for partition table and Non-Partition table & Antilop and Barracuda fileformats
+#Modify the path in the *.ISL files, for *.ibd files, for subpartition tables
+#change path separator Linux / format to windows  format by Perl script,
+#in the *.ISL files , in the Mysql data directory
+emp2#p#p1.isl
+emp2#p#p2.isl
+emp3.isl
+emp4#p#p1.isl
+emp4#p#p2.isl
+purchase#p#p0#sp#s0.isl
+purchase#p#p0#sp#s1.isl
+purchase#p#p1#sp#s2.isl
+purchase#p#p1#sp#s3.isl
+#Restart the DB server from unzip location of MySQL Data Dir 
+#Check the DB & tables with DML statements 
+use test;
+SHOW CREATE TABLE emp1;
+Table	Create Table
+emp1	CREATE TABLE `emp1` (
+  `empno` int(11) DEFAULT NULL,
+  `ename` varchar(30) DEFAULT NULL,
+  `sal` decimal(3,0) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+SHOW CREATE TABLE emp2;
+Table	Create Table
+emp2	CREATE TABLE `emp2` (
+  `empno` int(11) DEFAULT NULL,
+  `ename` varchar(30) DEFAULT NULL,
+  `sal` decimal(3,0) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY HASH (empno)
+(PARTITION p1 DATA DIRECTORY = 'MYSQL_TMP_DIR/mysqld.5980/tab1' ENGINE = InnoDB,
+ PARTITION p2 DATA DIRECTORY = 'MYSQL_TMP_DIR/mysqld.5980/tab2' ENGINE = InnoDB) */
+SHOW CREATE TABLE emp3;
+Table	Create Table
+emp3	CREATE TABLE `emp3` (
+  `empno` int(11) DEFAULT NULL,
+  `ename` varchar(30) DEFAULT NULL,
+  `sal` decimal(3,0) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 DATA DIRECTORY='MYSQL_TMP_DIR/mysqld.5980/tab3/'
+SHOW CREATE TABLE emp4;
+Table	Create Table
+emp4	CREATE TABLE `emp4` (
+  `empno` int(11) DEFAULT NULL,
+  `ename` varchar(30) DEFAULT NULL,
+  `sal` decimal(3,0) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
+/*!50100 PARTITION BY HASH (empno)
+(PARTITION p1 DATA DIRECTORY = 'MYSQL_TMP_DIR/mysqld.5980/tab4' ENGINE = InnoDB,
+ PARTITION p2 DATA DIRECTORY = 'MYSQL_TMP_DIR/mysqld.5980/tab5' ENGINE = InnoDB) */
+SHOW CREATE TABLE purchase;
+Table	Create Table
+purchase	CREATE TABLE `purchase` (
+  `id` int(11) DEFAULT NULL,
+  `purchased` date DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY RANGE ( YEAR(purchased))
+SUBPARTITION BY HASH ( TO_DAYS(purchased))
+(PARTITION p0 VALUES LESS THAN (1990)
+ (SUBPARTITION s0 DATA DIRECTORY = 'MYSQL_TMP_DIR/mysqld.5980/part0' ENGINE = InnoDB,
+  SUBPARTITION s1 DATA DIRECTORY = 'MYSQL_TMP_DIR/mysqld.5980/part1' ENGINE = InnoDB),
+ PARTITION p1 VALUES LESS THAN (2000)
+ (SUBPARTITION s2 DATA DIRECTORY = 'MYSQL_TMP_DIR/mysqld.5980/part2' ENGINE = InnoDB,
+  SUBPARTITION s3 DATA DIRECTORY = 'MYSQL_TMP_DIR/mysqld.5980/part3' ENGINE = InnoDB)) */
+SELECT COUNT(*) FROM emp1;
+COUNT(*)
+2
+SELECT COUNT(*) FROM emp2;
+COUNT(*)
+2
+SELECT COUNT(*) FROM emp3;
+COUNT(*)
+2
+SELECT COUNT(*) FROM emp4;
+COUNT(*)
+2
+SELECT COUNT(*) FROM purchase;
+COUNT(*)
+1
+DELETE  FROM emp1;
+DELETE  FROM emp2;
+DELETE  FROM emp3;
+DELETE  FROM emp4;
+DELETE FROM purchase;
+SELECT COUNT(*) FROM emp1;
+COUNT(*)
+0
+SELECT COUNT(*) FROM emp2;
+COUNT(*)
+0
+SELECT COUNT(*) FROM emp3;
+COUNT(*)
+0
+SELECT COUNT(*) FROM emp4;
+COUNT(*)
+0
+SELECT COUNT(*) FROM purchase;
+COUNT(*)
+0
+#Check the system tables have the entry of the tables.
+SELECT path FROM information_schema.innodb_sys_datafiles 
+ORDER BY path;
+path
+./test/emp1.ibd
+MYSQL_TMP_DIR/mysqld.5980/part0/test/purchase#p#p0#sp#s0.ibd
+MYSQL_TMP_DIR/mysqld.5980/part1/test/purchase#p#p0#sp#s1.ibd
+MYSQL_TMP_DIR/mysqld.5980/part2/test/purchase#p#p1#sp#s2.ibd
+MYSQL_TMP_DIR/mysqld.5980/part3/test/purchase#p#p1#sp#s3.ibd
+MYSQL_TMP_DIR/mysqld.5980/tab1/test/emp2#p#p1.ibd
+MYSQL_TMP_DIR/mysqld.5980/tab2/test/emp2#p#p2.ibd
+MYSQL_TMP_DIR/mysqld.5980/tab3/test/emp3.ibd
+MYSQL_TMP_DIR/mysqld.5980/tab4/test/emp4#p#p1.ibd
+MYSQL_TMP_DIR/mysqld.5980/tab5/test/emp4#p#p2.ibd
+SELECT name,file_format,row_format 
+FROM information_schema.innodb_sys_tablespaces  ORDER BY name;
+name	file_format	row_format
+test/emp1	Antelope	Compact or Redundant
+test/emp2#P#p1	Antelope	Compact or Redundant
+test/emp2#P#p2	Antelope	Compact or Redundant
+test/emp3	Antelope	Compact or Redundant
+test/emp4#P#p1	Barracuda	Dynamic
+test/emp4#P#p2	Barracuda	Dynamic
+test/purchase#P#p0#SP#s0	Antelope	Compact or Redundant
+test/purchase#P#p0#SP#s1	Antelope	Compact or Redundant
+test/purchase#P#p1#SP#s2	Antelope	Compact or Redundant
+test/purchase#P#p1#SP#s3	Antelope	Compact or Redundant
+SELECT name,n_cols,file_format,row_format 
+FROM information_schema.innodb_sys_tables 
+WHERE name LIKE '%emp%' ORDER BY name;
+name	n_cols	file_format	row_format
+test/emp1	6	Antelope	Compact
+test/emp2#P#p1	6	Antelope	Compact
+test/emp2#P#p2	6	Antelope	Compact
+test/emp3	6	Antelope	Compact
+test/emp4#P#p1	6	Barracuda	Dynamic
+test/emp4#P#p2	6	Barracuda	Dynamic
+SELECT name,n_cols,file_format,row_format 
+FROM information_schema.innodb_sys_tables 
+WHERE name LIKE '%purchase%' ORDER BY name;
+name	n_cols	file_format	row_format
+test/purchase#P#p0#SP#s0	5	Antelope	Compact
+test/purchase#P#p0#SP#s1	5	Antelope	Compact
+test/purchase#P#p1#SP#s2	5	Antelope	Compact
+test/purchase#P#p1#SP#s3	5	Antelope	Compact
+#
+# Cleanup
+#
+DROP TABLE emp1;
+DROP TABLE emp2;
+DROP TABLE emp3;
+DROP TABLE emp4;
+DROP TABLE purchase;
+CREATE DATABASE mtr;
+CREATE PROCEDURE mtr.check_warnings(OUT result INT)
+BEGIN
+SELECT 0 INTO RESULT;
+END|

=== added file 'mysql-test/suite/innodb/t/innodb-wl5980-windows.test'
--- a/mysql-test/suite/innodb/t/innodb-wl5980-windows.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/innodb/t/innodb-wl5980-windows.test	revid:kevin.lewis@stripped
@@ -0,0 +1,199 @@
+#
+# This testcase is related to WL5980, to test the portability feature.
+# Create a DB & tables with all kinds Non-Partition & partition on
+# Linux platform. Zip the entire DB and tablespaces on Windows.
+# Bring the zip file to Windows. Unzip the DB and modify the *.isl files
+# with the proper path of the *.ibd files. Restart the DB & check the
+# DB with a few DML operations. Test and validate the Linux DB on
+# Windows platform.
+# Prerequisite : portability_wl5980_windows.zip
+# should exist in "suite/innodb/t"
+
+# Windows-specific tests
+--source include/windows.inc
+--source include/have_innodb_16k.inc
+--source include/not_embedded.inc
+
+--echo # Set the environmental variables
+let $MYSQL_BASEDIR= `select @@basedir`;
+
+--echo # Stop server
+-- exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+-- shutdown_server 30
+-- source include/wait_until_disconnected.inc
+
+--echo # Copy the remote tablespace & DB zip files from suite location to working location.
+--copy_file $MYSQL_BASEDIR/mysql-test/suite/innodb/t/portability_wl5980_windows.zip $MYSQL_TMP_DIR/portability_wl5980_windows.zip
+
+--echo # Check that the file exists in the working folder.
+--file_exists $MYSQL_TMP_DIR/portability_wl5980_windows.zip
+
+--echo # Unzip the zip file.
+--exec unzip -q $MYSQL_TMP_DIR/portability_wl5980_windows.zip -d $MYSQL_TMP_DIR
+
+--echo # Remove the DOS based *.isl files from the MySql Data directory.
+--remove_file $MYSQL_TMP_DIR/mysqld.5980/data/test/emp2#p#p1.isl
+--remove_file $MYSQL_TMP_DIR/mysqld.5980/data/test/emp2#p#p2.isl
+
+--remove_file $MYSQL_TMP_DIR/mysqld.5980/data/test/emp3.isl
+
+--remove_file $MYSQL_TMP_DIR/mysqld.5980/data/test/emp4#p#p1.isl
+--remove_file $MYSQL_TMP_DIR/mysqld.5980/data/test/emp4#p#p2.isl
+
+--remove_file $MYSQL_TMP_DIR/mysqld.5980/data/test/purchase#p#p0#sp#s0.isl
+--remove_file $MYSQL_TMP_DIR/mysqld.5980/data/test/purchase#p#p0#sp#s1.isl
+--remove_file $MYSQL_TMP_DIR/mysqld.5980/data/test/purchase#p#p1#sp#s2.isl
+--remove_file $MYSQL_TMP_DIR/mysqld.5980/data/test/purchase#p#p1#sp#s3.isl
+
+--echo # Check that the *.ibd files are in the required location.
+--file_exists $MYSQL_TMP_DIR/mysqld.5980/tab1/test/emp2#p#p1.ibd
+--file_exists $MYSQL_TMP_DIR/mysqld.5980/tab2/test/emp2#p#p2.ibd
+
+--file_exists $MYSQL_TMP_DIR/mysqld.5980/tab3/test/emp3.ibd
+
+--file_exists $MYSQL_TMP_DIR/mysqld.5980/tab4/test/emp4#p#p1.ibd
+--file_exists $MYSQL_TMP_DIR/mysqld.5980/tab5/test/emp4#p#p2.ibd
+
+--file_exists $MYSQL_TMP_DIR/mysqld.5980/part0/test/purchase#p#p0#sp#s0.ibd
+--file_exists $MYSQL_TMP_DIR/mysqld.5980/part1/test/purchase#p#p0#sp#s1.ibd
+--file_exists $MYSQL_TMP_DIR/mysqld.5980/part2/test/purchase#p#p1#sp#s2.ibd
+--file_exists $MYSQL_TMP_DIR/mysqld.5980/part3/test/purchase#p#p1#sp#s3.ibd
+
+
+--echo # Create new *.isl files with the correct path to the *.ibd files,
+--exec echo $MYSQL_TMP_DIR/mysqld.5980/tab1/test/emp2#p#p1.ibd > $MYSQL_TMP_DIR/mysqld.5980/data/test/emp2#p#p1.isl
+--exec echo $MYSQL_TMP_DIR/mysqld.5980/tab2/test/emp2#p#p2.ibd > $MYSQL_TMP_DIR/mysqld.5980/data/test/emp2#p#p2.isl
+
+--exec echo $MYSQL_TMP_DIR/mysqld.5980/tab3/test/emp3.ibd  > $MYSQL_TMP_DIR/mysqld.5980/data/test/emp3.isl
+
+--exec echo $MYSQL_TMP_DIR/mysqld.5980/tab4/test/emp4#p#p1.ibd > $MYSQL_TMP_DIR/mysqld.5980/data/test/emp4#p#p1.isl
+--exec echo $MYSQL_TMP_DIR/mysqld.5980/tab5/test/emp4#p#p2.ibd > $MYSQL_TMP_DIR/mysqld.5980/data/test/emp4#p#p2.isl
+
+--exec echo $MYSQL_TMP_DIR/mysqld.5980/part0/test/purchase#p#p0#sp#s0.ibd > $MYSQL_TMP_DIR/mysqld.5980/data/test/purchase#p#p0#sp#s0.isl 
+--exec echo $MYSQL_TMP_DIR/mysqld.5980/part1/test/purchase#p#p0#sp#s1.ibd > $MYSQL_TMP_DIR/mysqld.5980/data/test/purchase#p#p0#sp#s1.isl
+--exec echo $MYSQL_TMP_DIR/mysqld.5980/part2/test/purchase#p#p1#sp#s2.ibd > $MYSQL_TMP_DIR/mysqld.5980/data/test/purchase#p#p1#sp#s2.isl
+--exec echo $MYSQL_TMP_DIR/mysqld.5980/part3/test/purchase#p#p1#sp#s3.ibd > $MYSQL_TMP_DIR/mysqld.5980/data/test/purchase#p#p1#sp#s3.isl
+
+--exec echo #change path separator Linux "/" format to windows "\" format by Perl script, 
+--exec echo #in the *.ISL files , in the Mysql data directory
+--perl  EOF
+use File::Copy;
+#use strict;
+#use warnings;
+my $dir= $ENV{'MYSQL_TMP_DIR'}."/mysqld.5980/data/test";
+opendir(DIR, $dir) or die $!;
+ while (my $file = readdir(DIR)) {
+ # Read files only in the Directory
+ next unless (-f "$dir/$file");
+ # Use a regular expression to find files ending in .isl
+    next unless ($file =~ m/\.isl$/);
+	# open file in write mode
+	open IN_FILE,"<", "$dir/$file" or die $!;
+	open OUT_FILE, ">", "$dir/tmp" or die $!;
+	while(<IN_FILE>) {
+        #change the path separator "/" to "\" in the file
+	 $_=~ s/"$//g;
+         $_=~ s/\//\\/g;
+	 print OUT_FILE $_;
+	}
+
+	close(IN_FILE);
+	close(OUT_FILE);
+	#move the new content from tmp file to the orginal file.
+	move("$dir/tmp", "$dir/$file");
+	print "$file\n";
+   }
+closedir(DIR);
+
+exit 0;
+EOF
+
+--echo # Restart the DB server from unzip location of MySQL Data Dir 
+-- exec echo "restart: --datadir=$MYSQL_TMP_DIR/mysqld.5980/data/ " > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+-- enable_reconnect
+-- source include/wait_until_connected_again.inc
+
+--echo # Check the DB & tables with DML statements.
+use test;
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE emp1;
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE emp2;
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE emp3;
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE emp4;
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SHOW CREATE TABLE purchase;
+
+SELECT COUNT(*) FROM emp1;
+SELECT COUNT(*) FROM emp2;
+SELECT COUNT(*) FROM emp3;
+SELECT COUNT(*) FROM emp4;
+SELECT COUNT(*) FROM purchase;
+
+DELETE  FROM emp1;
+DELETE  FROM emp2;
+DELETE  FROM emp3;
+DELETE  FROM emp4;
+DELETE FROM purchase;
+
+SELECT COUNT(*) FROM emp1;
+SELECT COUNT(*) FROM emp2;
+SELECT COUNT(*) FROM emp3;
+SELECT COUNT(*) FROM emp4;
+SELECT COUNT(*) FROM purchase;
+
+--echo # Check the system tables have the proper entry of the tables.
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
+SELECT path FROM information_schema.innodb_sys_datafiles 
+       ORDER BY path;
+SELECT name,file_format,row_format 
+       FROM information_schema.innodb_sys_tablespaces
+       ORDER BY name;
+SELECT name,n_cols,file_format,row_format 
+       FROM information_schema.innodb_sys_tables 
+       WHERE name LIKE '%emp%' ORDER BY name;
+SELECT name,n_cols,file_format,row_format 
+       FROM information_schema.innodb_sys_tables 
+       WHERE name LIKE '%purchase%' ORDER BY name;
+
+--echo #
+--echo # Cleanup
+--echo #
+
+DROP TABLE emp1;
+DROP TABLE emp2;
+DROP TABLE emp3;
+DROP TABLE emp4;
+DROP TABLE purchase;
+
+# The following lines of code just to dupe the MTR frame work nothing to do with WL,
+# As MTR thinks that it was a failure, When the server logs contains error/warnings
+# even though there are no result mismatch.It is an expected behavior of the server.
+
+CREATE DATABASE mtr;
+DELIMITER |;
+CREATE PROCEDURE mtr.check_warnings(OUT result INT)
+BEGIN
+SELECT 0 INTO RESULT;
+END|
+
+--rmdir $MYSQL_TMP_DIR/mysqld.5980/tab1/test
+--rmdir $MYSQL_TMP_DIR/mysqld.5980/tab2/test
+--rmdir $MYSQL_TMP_DIR/mysqld.5980/tab3/test
+--rmdir $MYSQL_TMP_DIR/mysqld.5980/tab4/test
+--rmdir $MYSQL_TMP_DIR/mysqld.5980/tab5/test
+--rmdir $MYSQL_TMP_DIR/mysqld.5980/part0/test
+--rmdir $MYSQL_TMP_DIR/mysqld.5980/part1/test
+--rmdir $MYSQL_TMP_DIR/mysqld.5980/part2/test
+--rmdir $MYSQL_TMP_DIR/mysqld.5980/part3/test
+--rmdir $MYSQL_TMP_DIR/mysqld.5980/tab1
+--rmdir $MYSQL_TMP_DIR/mysqld.5980/tab2
+--rmdir $MYSQL_TMP_DIR/mysqld.5980/tab3
+--rmdir $MYSQL_TMP_DIR/mysqld.5980/tab4
+--rmdir $MYSQL_TMP_DIR/mysqld.5980/tab5
+--rmdir $MYSQL_TMP_DIR/mysqld.5980/part0
+--rmdir $MYSQL_TMP_DIR/mysqld.5980/part1
+--rmdir $MYSQL_TMP_DIR/mysqld.5980/part2
+--rmdir $MYSQL_TMP_DIR/mysqld.5980/part3

=== added file 'mysql-test/suite/innodb/t/portability_wl5980_windows.zip'
Binary files a/mysql-test/suite/innodb/t/portability_wl5980_windows.zip	1970-01-01 00:00:00 +0000 and b/mysql-test/suite/innodb/t/portability_wl5980_windows.zip	revid:kevin.lewis@stripped differ

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk branch (kevin.lewis:3983 to 3984) kevin.lewis11 Jun