bzr commit into mysql-trunk-innodb branch (kevin.lewis:3346)

[kevin.lewis]

#At file:///Users/kevinlewis/Work/Mysql/55222.push/mysql-trunk-innodb/ based on revid:kevin.lewis@stripped

 3346 kevin.lewis@stripped	2010-11-30 [merge]
      Merge from mysql-5.5-innodb

    modified:
      storage/innobase/dict/dict0mem.c
=== modified file 'storage/innobase/dict/dict0mem.c'
--- a/storage/innobase/dict/dict0mem.c	revid:kevin.lewis@stripped
+++ b/storage/innobase/dict/dict0mem.c	revid:kevin.lewis@stripped
@@ -34,6 +34,7 @@ Created 1/8/1996 Heikki Tuuri
 #include "mach0data.h"
 #include "dict0dict.h"
 #include "srv0srv.h" /* srv_lower_case_table_names */
+#include "ha_prototypes.h" /* innobase_casedn_str()*/
 #ifndef UNIV_HOTBACKUP
 # include "lock0lock.h"
 #endif /* !UNIV_HOTBACKUP */

No bundle (reason: revision is a merge).