bzr push into mysql-trunk branch (kevin.lewis:3993 to 3994)

[kevin.lewis]

 3994 kevin.lewis@stripped	2012-06-12
      Fix for innodb-wl5980-alter.test which was failing on one pb2 system where the default-storage-engine somehow got set to myisam. Now it is explicitly set.

    modified:
      mysql-test/suite/innodb/r/innodb-wl5980-alter.result
      mysql-test/suite/innodb/t/innodb-wl5980-alter.test
 3993 kevin.lewis@stripped	2012-06-12
      Fix for problem 14, rb:956

    modified:
      storage/innobase/row/row0mysql.cc
=== modified file 'mysql-test/suite/innodb/r/innodb-wl5980-alter.result'
--- a/mysql-test/suite/innodb/r/innodb-wl5980-alter.result	revid:kevin.lewis@stripped
+++ b/mysql-test/suite/innodb/r/innodb-wl5980-alter.result	revid:kevin.lewis@stripped
@@ -2,6 +2,7 @@
 # This is a copy of innodb-alter.test except using remote tablespaces
 # and showing those files.
 #
+SET default_storage_engine=InnoDB;
 SET GLOBAL innodb_file_per_table=ON;
 SET NAMES utf8;
 CREATE TABLE t1 (

=== modified file 'mysql-test/suite/innodb/t/innodb-wl5980-alter.test'
--- a/mysql-test/suite/innodb/t/innodb-wl5980-alter.test	revid:kevin.lewis@stripped
+++ b/mysql-test/suite/innodb/t/innodb-wl5980-alter.test	revid:kevin.lewis@stripped
@@ -14,6 +14,7 @@ LET $MYSQL_DATA_DIR = `select @@datadir`
 LET $data_directory_clause = DATA DIRECTORY='$MYSQL_TMP_DIR/alt_dir';
 --enable_query_log
 
+SET default_storage_engine=InnoDB;
 SET GLOBAL innodb_file_per_table=ON;
 
 SET NAMES utf8;

No bundle (reason: useless for push emails).