bzr push into mysql-trunk branch (kevin.lewis:3948 to 3949)

[kevin.lewis]

 3949 kevin.lewis@stripped	2012-06-06
      PB2 failure on innodb-tablespaces in innodb_2k_size run on windows
      was caused by innodb-index-online.test which did not clean up the
      t1.ibt file it created.

    modified:
      mysql-test/suite/innodb/t/innodb-index-online.test
      mysql-test/suite/innodb/t/innodb-wl5980-discard.test
      storage/innobase/handler/ha_innodb.cc
 3948 kevin.lewis@stripped	2012-06-05
      Move tests from innodb-wl5522-wl5980.test into innodb-wl5980-discard.test
      and add a negative test requested by viswa.  Delete innodb-wl5522-wl5980.

    removed:
      mysql-test/suite/innodb/r/innodb-wl5522-wl5980.result
      mysql-test/suite/innodb/t/innodb-wl5522-wl5980.test
    added:
      mysql-test/suite/innodb/t/portability_wl5980_linux.zip
    modified:
      mysql-test/suite/innodb/r/innodb-wl5980-debug.result
      mysql-test/suite/innodb/r/innodb-wl5980-discard.result
      mysql-test/suite/innodb/t/innodb-wl5980-debug.test
      mysql-test/suite/innodb/t/innodb-wl5980-discard.test
=== modified file 'mysql-test/suite/innodb/t/innodb-index-online.test'
--- a/mysql-test/suite/innodb/t/innodb-index-online.test	revid:kevin.lewis@stripped
+++ b/mysql-test/suite/innodb/t/innodb-index-online.test	revid:kevin.lewis@stripped
@@ -394,6 +394,12 @@ SET GLOBAL innodb_monitor_disable = modu
 
 DROP TABLE t1;
 
+--disable_query_log
+# The ibt file does not get deleted by this DROP TABLE
+LET $MYSQL_DATA_DIR = `select @@datadir`;
+--remove_file $MYSQL_DATA_DIR/test/t1.ibt
+--enable_query_log
+
 # Check that all connections opened by test cases in this file are really
 # gone so execution of other tests won't be affected by their presence.
 --source include/wait_until_count_sessions.inc

=== modified file 'mysql-test/suite/innodb/t/innodb-wl5980-discard.test'
--- a/mysql-test/suite/innodb/t/innodb-wl5980-discard.test	revid:kevin.lewis@stripped
+++ b/mysql-test/suite/innodb/t/innodb-wl5980-discard.test	revid:kevin.lewis@stripped
@@ -289,7 +289,7 @@ SELECT * FROM t1;
 CHECK TABLE t1;
 
 --echo #
---echo # Reloacte this discarded file to the default directory
+--echo # Relocate this discarded file to the default directory
 --echo # instead of the remote directory it was discarded from.
 --echo # Put cfg, ibt, and idb files into the default directory.
 --echo # Delete the isl file and the remote cfg and ibt files.

=== modified file 'storage/innobase/handler/ha_innodb.cc'
--- a/storage/innobase/handler/ha_innodb.cc	revid:kevin.lewis@stripped
+++ b/storage/innobase/handler/ha_innodb.cc	revid:kevin.lewis@stripped
@@ -8996,7 +8996,7 @@ ha_innobase::parse_table_name(
 
 	if (use_tablespace
 	    && !mysqld_embedded
-	    && (!(create_info->options & HA_LEX_CREATE_TMP_TABLE))) {
+	    && !(create_info->options & HA_LEX_CREATE_TMP_TABLE)) {
 
 		if ((name[1] == ':')
 		    || (name[0] == '\\' && name[1] == '\\')) {

No bundle (reason: useless for push emails).