bzr push into mysql-trunk branch (kevin.lewis:3907 to 3908)

[kevin.lewis]

 3908 kevin.lewis@stripped	2012-05-28
      Fix for recent changein innodb-multiple-tablespaces.test

    modified:
      mysql-test/suite/innodb/r/innodb-multiple-tablespaces.result
 3907 kevin.lewis@stripped	2012-05-28
      Review edits requested by Sunny and Jimmy.
      A fix for the failing innodb-index-online.test

    modified:
      mysql-test/suite/innodb/t/innodb-multiple-tablespaces.test
      storage/innobase/dict/dict0crea.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/handler0alter.cc
      storage/innobase/include/dict0crea.h
      storage/innobase/include/row0mysql.h
      storage/innobase/pars/pars0pars.cc
      storage/innobase/row/row0merge.cc
      storage/innobase/row/row0mysql.cc
=== modified file 'mysql-test/suite/innodb/r/innodb-multiple-tablespaces.result'
--- a/mysql-test/suite/innodb/r/innodb-multiple-tablespaces.result	revid:kevin.lewis@stripped
+++ b/mysql-test/suite/innodb/r/innodb-multiple-tablespaces.result	revid:kevin.lewis@stripped
@@ -308,7 +308,7 @@ yyy.ibd
 # the data dictionary in order to determine if the table it is
 # openeing is the correct one, or to finde the previous location
 # of a tablespace from SYS_DATAFILES.  It must rely on the ISL file
-# to tell the truth. But it can compare the current linked location 
+# to tell the truth. But it can compare the current linked location
 # with a tablespace found in the default location and use the most
 # recent.
 #
@@ -381,10 +381,10 @@ yy.ibd
 #
 # Delete the extra copy of yy.
 # AA; Control table, used as the source of 'wrong' tablespaces and opened first during recovery.
-# YN; Tablespace found the default directory but not in alt_dir 
+# YN; Tablespace found the default directory but not in alt_dir.
 # NY; Tablespace found in alt_dir but not the default directory.
 # YW; Tablespace found in the default directory but the wrong file in alt_dir
-# WY; The wrong tablespace found in the default directory and the corect one in alt_dir 
+# WY; The wrong tablespace found in the default directory and the corect one in alt_dir
 ---- MYSQLD_DATADIR/test
 aa.frm
 aa.ibd

No bundle (reason: useless for push emails).