From: Tor Didriksen Date: October 25 2010 12:19pm Subject: bzr push into mysql-trunk-merge branch (tor.didriksen:3296 to 3297) List-Archive: http://lists.mysql.com/commits/121801 Message-Id: <20101025121942.425433723@atum07.norway.sun.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 3297 Tor Didriksen 2010-10-25 Fix broken build on solaris/dbg only identifiers with external linkage may have linker scoping: dict_lru_validate @ storage/innobase/dict/dict0dict.c Use the same storage class for declaration and definition of functions. modified: storage/innobase/dict/dict0dict.c 3296 Horst.Hunger 2010-10-25 [merge] merge of changes from 5.5. modified: mysql-test/r/plugin_auth_qa_2.result mysql-test/t/plugin_auth_qa_1.test mysql-test/t/plugin_auth_qa_2.test === modified file 'storage/innobase/dict/dict0dict.c' --- a/storage/innobase/dict/dict0dict.c 2010-10-21 16:44:03 +0000 +++ b/storage/innobase/dict/dict0dict.c 2010-10-25 12:19:13 +0000 @@ -193,14 +193,14 @@ dict_table_remove_from_cache_low( /**********************************************************************//** Validate the dictionary table LRU list. @return TRUE if validate OK */ -static +UNIV_INTERN ibool dict_lru_validate(void); /*===================*/ /**********************************************************************//** Check if table is in the dictionary table LRU list. @return TRUE if table found */ -static +UNIV_INTERN ibool dict_lru_find_table( /*================*/ No bundle (reason: useless for push emails).