bzr push into mysql-trunk branch (vinay.fisrekar:4315 to 4316)

[Vinay Fisrekar]

 4316 Vinay Fisrekar	2012-09-17
      Test fix for failure on windows.

    modified:
      mysql-test/suite/innodb/r/innodb-wl6445.result
      mysql-test/suite/innodb/t/innodb-wl6445-1.test
      mysql-test/suite/innodb/t/innodb-wl6445.test
 4315 Sunny Bains	2012-09-17
      WL#6445 - We have to allocate and use the SYNC AIO array for Windows SYNC IO.

    modified:
      storage/innobase/os/os0file.cc
=== modified file 'mysql-test/suite/innodb/r/innodb-wl6445.result'
--- a/mysql-test/suite/innodb/r/innodb-wl6445.result	2012-09-12 04:20:04 +0000
+++ b/mysql-test/suite/innodb/r/innodb-wl6445.result	2012-09-17 11:08:30 +0000
@@ -36,7 +36,7 @@ ERROR 42S02: Unknown table 'WL6445.t1'
 TRUNCATE TABLE WL6445.t1;
 ERROR HY000: Table 't1' is read only
 RENAME TABLE WL6445.t1 TO WL6444.t2;
-ERROR HY000: Error on rename of './WL6445/t1' to './WL6444/t2' (errno: 165 - Table is read only)
+ERROR HY000: Error on rename of 't1' to 't2' (errno: 165 - Table is read only)
 DROP DATABASE WL6445;
 ERROR 42S02: Unknown table 'WL6445.t1'
 SHOW CREATE TABLE WL6445.t1;

=== modified file 'mysql-test/suite/innodb/t/innodb-wl6445-1.test'
--- a/mysql-test/suite/innodb/t/innodb-wl6445-1.test	2012-09-12 04:20:04 +0000
+++ b/mysql-test/suite/innodb/t/innodb-wl6445-1.test	2012-09-17 11:08:30 +0000
@@ -373,9 +373,6 @@ UNLOCK TABLES;
 --shutdown_server 10
 --source include/wait_until_disconnected.inc
 # Do something while server is down
---exec chmod 0644 $MYSQLD_DATADIR/ibdata1
---exec chmod 0644 $MYSQLD_DATADIR/ib_logfile0
---exec chmod 0660 $MYSQLD_DATADIR/testdb_wl6445/t1.ibd
 --enable_reconnect
 # Write file to make mysql-test-run.pl start up the server again
 --exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect

=== modified file 'mysql-test/suite/innodb/t/innodb-wl6445.test'
--- a/mysql-test/suite/innodb/t/innodb-wl6445.test	2012-09-12 04:20:04 +0000
+++ b/mysql-test/suite/innodb/t/innodb-wl6445.test	2012-09-17 11:08:30 +0000
@@ -59,15 +59,18 @@ ALTER TABLE WL6445.t1 DROP INDEX sec_idx
 
 # FIXME: Should bne
 #--error ER_OPEN_AS_READONLY
+--replace_regex /wl6445/WL6445/i
 --error ER_BAD_TABLE_ERROR
 DROP TABLE WL6445.t1;
 
 --error ER_OPEN_AS_READONLY
 TRUNCATE TABLE WL6445.t1;
 
+--replace_regex /'\..*t1'/'t1'/  /'\..*t2'/'t2'/
 --error ER_ERROR_ON_RENAME
 RENAME TABLE WL6445.t1 TO WL6444.t2;
 
+--replace_regex /wl6445/WL6445/i
 --error ER_BAD_TABLE_ERROR
 DROP DATABASE WL6445;
 

No bundle (reason: useless for push emails).