From: kevin.lewis
Date: December 1 2010 2:16am
Subject: bzr push into mysql-trunk-innodb branch (kevin.lewis:3345 to 3346)
List-Archive: http://lists.mysql.com/commits/125593
Message-Id: <20101201021626.73FF4813172@dhcp-adc-twvpn-2-vpnpool-10-154-61-32.vpn.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

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

    modified:
      storage/innobase/dict/dict0mem.c
 3345 kevin.lewis@stripped	2010-11-30 [merge]
      Merge Bug#55222 from mysql-5.5-innodb

    modified:
      mysql-test/r/lowercase_table4.result
      mysql-test/suite/innodb/r/innodb_bug57904.result
      mysql-test/suite/innodb/t/innodb_bug57904.test
      mysql-test/t/lowercase_table4.test
      storage/innobase/dict/dict0dict.c
      storage/innobase/dict/dict0load.c
      storage/innobase/dict/dict0mem.c
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/include/dict0mem.h
      storage/innobase/include/srv0srv.h
      storage/innobase/row/row0ins.c
      storage/innobase/row/row0mysql.c
      storage/innobase/row/row0upd.c
      storage/innobase/srv/srv0srv.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: useless for push emails).