bzr push into mysql-5.5-innodb branch (marko.makela:3247 to 3248) Bug#55222

[marko.makela]

 3248 Marko Mäkelä	2010-12-01
      Fix a compilation error that was introduced in the Bug #55222 fix
      (bzr revision id kevin.lewis@strippedaeeys3tjqx).

    modified:
      storage/innobase/dict/dict0mem.c
 3247 Marko Mäkelä	2010-12-01 [merge]
      Merge mysql-5.1-innodb to mysql-5.5-innodb.

    modified:
      storage/innobase/trx/trx0i_s.c
=== modified file 'storage/innobase/dict/dict0mem.c'
--- a/storage/innobase/dict/dict0mem.c	revid:marko.makela@stripped932-xj3t62isqq5lw47j
+++ b/storage/innobase/dict/dict0mem.c	revid:marko.makela@stripped13cnu04
@@ -294,7 +294,7 @@ Sets the foreign_table_name_lookup point
 srv_lower_case_table_names.  If that is 0 or 1, foreign_table_name_lookup
 will point to foreign_table_name.  If 2, then another string is allocated
 of the heap and set to lower case. */
-UNIV_INLINE
+UNIV_INTERN
 void
 dict_mem_foreign_table_name_lookup_set(
 /*===================================*/
@@ -321,7 +321,7 @@ Sets the referenced_table_name_lookup po
 srv_lower_case_table_names.  If that is 0 or 1,
 referenced_table_name_lookup will point to referenced_table_name.  If 2,
 then another string is allocated of the heap and set to lower case. */
-UNIV_INLINE
+UNIV_INTERN
 void
 dict_mem_referenced_table_name_lookup_set(
 /*======================================*/

Attachment: [text/bzr-bundle] bzr/[e-mail]