bzr push into mysql-trunk branch (kevin.lewis:3984 to 3985)

[kevin.lewis]

 3985 kevin.lewis@stripped	2012-06-11
      fix previous pb2 failures

    modified:
      mysql-test/suite/innodb/r/innodb-wl5980-windows.result
      mysql-test/suite/innodb/t/innodb-tablespace.test
 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
=== modified file 'mysql-test/suite/innodb/r/innodb-wl5980-windows.result'
--- a/mysql-test/suite/innodb/r/innodb-wl5980-windows.result	revid:kevin.lewis@stripped
+++ b/mysql-test/suite/innodb/r/innodb-wl5980-windows.result	revid:kevin.lewis@stripped
@@ -1,11 +1,11 @@
-#set the environmental variables
+# 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
+# Copy the remote tablespace & DB zip files from suite location to working location.
+# Check that the file exists in the working folder.
+# Unzip the zip file.
+# Remove the DOS based *.isl files from the MySql Data directory.
+# Check that the *.ibd files are in the required location.
+# Create new *.isl files with the correct path to the *.ibd files,
 #change path separator Linux / format to windows  format by Perl script,
 #in the *.ISL files , in the Mysql data directory
 emp2#p#p1.isl
@@ -17,8 +17,8 @@ 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 
+# 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
@@ -103,7 +103,7 @@ COUNT(*)
 SELECT COUNT(*) FROM purchase;
 COUNT(*)
 0
-#Check the system tables have the entry of the tables.
+# Check the system tables have the proper entry of the tables.
 SELECT path FROM information_schema.innodb_sys_datafiles 
 ORDER BY path;
 path
@@ -118,7 +118,8 @@ MYSQL_TMP_DIR/mysqld.5980/tab3/test/emp3
 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;
+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

=== modified file 'mysql-test/suite/innodb/t/innodb-tablespace.test'
--- a/mysql-test/suite/innodb/t/innodb-tablespace.test	revid:kevin.lewis@stripped
+++ b/mysql-test/suite/innodb/t/innodb-tablespace.test	revid:kevin.lewis@stripped
@@ -28,7 +28,7 @@ LET $innodb_strict_mode_orig=`select @@s
 --echo #
 SET SESSION innodb_strict_mode = ON;
 --replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
---error ER_GET_ERRNO
+--error 1030
 eval CREATE TABLE t1 (a int KEY, b text) $index_directory_clause;
 SHOW WARNINGS;
 

No bundle (reason: useless for push emails).