From: kevin.lewis Date: December 1 2010 2:13am Subject: bzr commit into mysql-5.5-innodb branch (kevin.lewis:3246) Bug#55222 List-Archive: http://lists.mysql.com/commits/125590 X-Bug: 55222 Message-Id: <20101201021310.B755881300A@dhcp-adc-twvpn-2-vpnpool-10-154-61-32.vpn.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============2138044810==" --===============2138044810== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///Users/kevinlewis/Work/Mysql/55222.push/mysql-5.5-innodb/ based on revid:kevin.lewis@stripped 3246 kevin.lewis@stripped 2010-11-30 Fix compiler warning for Bug#55222 patch. 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 */ --===============2138044810== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/kevin.lewis@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: kevin.lewis@stripped # target_branch: file:///Users/kevinlewis/Work/Mysql/55222.push/mysql-\ # 5.5-innodb/ # testament_sha1: 4e3f5bf42387bf69a3e303a567f96e9355185384 # timestamp: 2010-11-30 20:13:09 -0600 # base_revision_id: kevin.lewis@stripped\ # hfydggaeeys3tjqx # # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWbsJG14AAYRfgAAQWnP/91MA AAC////wUANDD3Guodx1hJIplMw0JpH6VPaYUT9EaR5BqZMMiJiaGJpGkeoGho0MgA0EkhomkxJ6 NSbyaoepp5J6mh+qaNAGNDQ0AGQ0AAAAAEpGoRvVDQ0NMj1AAAABVdQ39+jyibU0LpgN0Yvc9z9N dZNFmY6c186peA4oe9/xZP69Pv+Y162tYHdI2lkIa+KHNgxVGtayiWfPC/ovcRvqF1XvkplqDGGU b4vloXBIl7bEjhu3s+fueLJs5wCIe5Ml8wgMKCWKysHKCfqmXBq9lkrheMxHmwpxzOnJw5RlFcBM K+sOVuO8ICifheWx63Tp1+6v2vCfylQuZA4/F1AiLANcxFBRynMT+E5WlN1QsnwUqRDw8m2RoVcR eK8L1vmpmBnYayPiIOVK9WJUfkUhEMgpMjFmlY2HBsdIQCqOgOjwdDdloZZA43pjIGEYPGSjIox9 KFddVKi13NSc0opU3lmwshhgaukotlK1anWUUC7EQFUBvCMs1tWWDKZPL9QQxlngLhba+kjIXRcl gLnsL1KPSwWAOe2K8z4ZYlsOkc/buWqROrDM3pyi6NYXNuYO+vZx4AmJnVQbmApXO94hy8O4kOdH iBOwDdOjMYkcqbeAani9Ybq/bJeFv68sQYmUhIOih1S7aJ6hqhD7jG6LMkMmSMdtgMK6VbAtNAsW naMc3DbvO+rRawy4gfhG/sNUKKeaEx108xx305VctKcLR2+FIT+c9z6u5sfWxvGwNhhJDRsbXDL0 P+mVt3hHbeX0imPZImCZI2KgJJwt7/RyuJTaXkD604xZcjEH8cwwRYGWavD9zcgpW243kJxS800j zcsXluaR1yCmeSbtdXLtDokThnwi02wwzI5g7FI55QH6oGBnhmlRByY0QhPlrSfURYveqR6LDcZS eRBpQZIZc9XkiTGtb1E7y5EGTLnEfBCkHaI/qkaBBeMFc8Md+LMmgPtCm+emf+CzLjcyiktpIs0w J20U7I3DvJMoYBcLikOrYC4ZpF4CPOy2AAcBYkMzsQqvAXsWMxo2ecR5AqFqeEJJ4Lufur+dKKti xSV7JHoK8uZcwbqJ0lRguqEJ5Rf4u5IpwoSF2Eja8A== --===============2138044810==--