bzr push into mysql-trunk-innodb branch (kevin.lewis:3530 to 3531)

[kevin.lewis]

 3531 kevin.lewis@stripped	2011-03-08 [merge]
      merge from mysql-5.5-innodb

    modified:
      mysql-test/suite/innodb/t/innodb_bug60196.test
 3530 kevin.lewis@stripped	2011-03-07 [merge]
      Merge from mysql-5.5-innodb

    added:
      mysql-test/suite/innodb/r/innodb_bug60196.result
      mysql-test/suite/innodb/t/innodb_bug60196-master.opt
      mysql-test/suite/innodb/t/innodb_bug60196.test
    modified:
      storage/innobase/dict/dict0load.c
=== modified file 'mysql-test/suite/innodb/t/innodb_bug60196.test'
--- a/mysql-test/suite/innodb/t/innodb_bug60196.test	revid:kevin.lewis@stripped
+++ b/mysql-test/suite/innodb/t/innodb_bug60196.test	revid:kevin.lewis@stripped
@@ -2,7 +2,9 @@
 # Foreign Key problems after an engine is restarted.
 
 # This test case needs InnoDB.
--- source include/have_innodb.inc
+--source include/have_innodb.inc
+--source include/have_lowercase2.inc
+--source include/have_case_insensitive_file_system.inc
 
 #
 # Precautionary clean up.

No bundle (reason: useless for push emails).