bzr push into mysql-trunk branch (kevin.lewis:3913 to 3914)

[kevin.lewis]

 3914 kevin.lewis@stripped	2012-05-31
      Attempt to fix failing mtr test innodb-system-table-view.test

    modified:
      mysql-test/suite/innodb/r/innodb-system-table-view.result
      mysql-test/suite/innodb/t/innodb-system-table-view.test
 3913 kevin.lewis@stripped	2012-05-30
      A few changes to increase coverage and clean up code.

    modified:
      storage/innobase/dict/dict0dict.cc
      storage/innobase/dict/dict0load.cc
      storage/innobase/fil/fil0fil.cc
      storage/innobase/include/fil0fil.h
      storage/innobase/row/row0import.cc
=== modified file 'mysql-test/suite/innodb/r/innodb-system-table-view.result'
--- a/mysql-test/suite/innodb/r/innodb-system-table-view.result	revid:kevin.lewis@stripped
+++ b/mysql-test/suite/innodb/r/innodb-system-table-view.result	revid:kevin.lewis@stripped
@@ -41,6 +41,7 @@ SELECT * FROM INFORMATION_SCHEMA.INNODB_
 ID	FOR_COL_NAME	REF_COL_NAME	POS
 SET GLOBAL innodb_file_format=`Barracuda`;
 SET GLOBAL innodb_file_per_table=ON;
+DROP TABLE IF EXISTS t1, t2, t3, t4;
 CREATE TABLE t1 (a INT KEY, b TEXT) ROW_FORMAT=REDUNDANT ENGINE=innodb;
 CREATE TABLE t2 (a INT KEY, b TEXT) ROW_FORMAT=COMPACT ENGINE=innodb;
 CREATE TABLE t3 (a INT KEY, b TEXT) ROW_FORMAT=COMPRESSED ENGINE=innodb;

=== modified file 'mysql-test/suite/innodb/t/innodb-system-table-view.test'
--- a/mysql-test/suite/innodb/t/innodb-system-table-view.test	revid:kevin.lewis@stripped
+++ b/mysql-test/suite/innodb/t/innodb-system-table-view.test	revid:kevin.lewis@stripped
@@ -45,6 +45,11 @@ SELECT * FROM INFORMATION_SCHEMA.INNODB_
 
 SET GLOBAL innodb_file_format=`Barracuda`;
 SET GLOBAL innodb_file_per_table=ON;
+
+--disable_warnings
+DROP TABLE IF EXISTS t1, t2, t3, t4;
+--enable_warnings
+
 CREATE TABLE t1 (a INT KEY, b TEXT) ROW_FORMAT=REDUNDANT ENGINE=innodb;
 CREATE TABLE t2 (a INT KEY, b TEXT) ROW_FORMAT=COMPACT ENGINE=innodb;
 CREATE TABLE t3 (a INT KEY, b TEXT) ROW_FORMAT=COMPRESSED ENGINE=innodb;

No bundle (reason: useless for push emails).