From: Tor Didriksen
Date: October 25 2010 12:19pm
Subject: bzr commit into mysql-trunk-merge branch (tor.didriksen:3297)
List-Archive: http://lists.mysql.com/commits/121800
Message-Id: <20101025121917.E1A1F3723@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1903990081768479026=="

--===============1903990081768479026==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///export/home/didrik/repo/trunk-merge/ based on revid:horst.hunger@stripped

 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
=== 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(
 /*================*/


--===============1903990081768479026==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/tor.didriksen@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   96epoovq4aysyuqi
# target_branch: file:///export/home/didrik/repo/trunk-merge/
# testament_sha1: 85d3aa80de797d9b419175ae81272cd89e0e229e
# timestamp: 2010-10-25 14:19:17 +0200
# source_branch: file:///export/home/didrik/repo/5.5-bugteam-bug57203/
# base_revision_id: horst.hunger@stripped\
#   0baxqamc2pis17x5
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcS8hoMAAahfgEAQUmP/91ch
FwC/7//wUAQN5aalZbBsKoSiJoE2iGm1T0xSfqeSamynppH6kyaHoMAAAABoAAAAAEkQCTQyT0mn
op6RtRp6Q0YhoMgwAAAAGgAAAAASSRhNJp6Jo1TelPJinqNNGgA/U1DTlttxF06nOENxv2MR6BQy
hslpBvnvkrfGqqmlQfyKNS5q62hGEaebejYQ8Pd5R/f49fyxTzmZaI6IKLxeA1u3aZYbd3iDmC8H
rp78liGgjQKgmJ4YSvrnllSvZFEZJktqVSqwvhB7PsdzglvbQoGSRWIyBhKrkVlIBgQYLRCaO5b9
SJxiF52MUZcJiOLCNK4mqU3PpidbKEomE7dls9dwnWCLs+IVa5G+gQ13p59+xICzmxncsWDcZas8
Gem8RY553ChdOKDS5LZFO2cQxopBu+rcO9KxLkuKxiPET2hp5dIOYPLCwRtNqMs5OyPDlYSpBSzI
lXYWYdZKzgUQSN/NTamQUJ8Ec0+izuWkUK12X9QXymxusGja94sLzTbDJdeEDuC3UER7X0vc5RJ0
BmvDYuVmQYOBnlkbX8JLdqxIrWDCdVGjA8eFwp0auXjHdStzWDFuRhje1lV4jFHUHqzlZhSrViFP
kZfHDaSfnDs5d2oJAdFbIZhvvqq/ZFLh2PqaHmeZMrIWjVnYt2tRgd8+jD/YDQtDLf5O+cjS4B/R
Weq1Chr7dafykbq5MfTpSgu1czdEySEaNsE61InO05/g4k3q1HRTAtNvhWaZoKawrvUj5BrgweUO
eDvsGvMZHWzhye3TZUA9Is5QAKFOu/KerfEqVVKJ4LY3f9vEL/ZiTxmHqEkVc6VZJWiZkyBjq4ab
fuzxx3uQFiZ3s28F4I3ODOU9M1Ks1EYPyJ7o6cGRXa1kwsjmXP4ZZxVE8ia1GJKI6KFlaQma+5Yk
nCJMG3zhWPTLusC+8en/43rT3XDEaLc2ZCtQYld6rAJGy0KmKcx4Kjih7yiwA8dAyp7ORHat1EQv
hqA5uQiJnZBrnxkece10JaC0FqnR4fNmdXKarCCGbqNmHEDv4BIJOXpZY0cWHAMpZjbd+q2u6aRk
qxRheaDGkokdcWZXqDjwSe1qSaYSZQVndDEGueooMmWZG1u59mIKhJg57HnuE0/1ozS9AGE6vVIL
WllpyZgcgeC2Cp0T4C8lAVDdR0mEwl8ICpleTN/ICdVHXaemMkzcJodZ7t+YSiXEtLuoGHFikwaZ
g05TLk1Ukb14O/go94YMjBMKEH6iMXva4ywlBstd15GejtPEaXbqFUIIs6q/RnziDc09FWIo+qk1
xx7gxFtl+F5WKAXOk4fUK4TUJ/8XckU4UJDEvIaD


--===============1903990081768479026==--