From: kevin.lewis
Date: December 9 2010 5:29pm
Subject: bzr commit into mysql-trunk-innodb branch (kevin.lewis:3373) Bug#58629
List-Archive: http://lists.mysql.com/commits/126469
X-Bug: 58629
Message-Id: <20101209172935.811E98782BB@kevin-lewis-macbook.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0783966037=="

--===============0783966037==
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-trunk-innodb/ based on revid:kevin.lewis@stripped

 3373 kevin.lewis@stripped	2010-12-09
      Bug#58629 - Do not define UNIV_MUST_NOT_INLINE on any platform and try it out on pushbuild

    modified:
      storage/innobase/include/univ.i
=== modified file 'storage/innobase/include/univ.i'
--- a/storage/innobase/include/univ.i	revid:kevin.lewis@stripped
+++ b/storage/innobase/include/univ.i	revid:kevin.lewis@stripped
@@ -125,7 +125,7 @@ Sun Studio */
 
 # if !defined(__GNUC__) && !(defined(__SUNPRO_C) || defined(__SUNPRO_CC))
 #  undef  UNIV_MUST_NOT_INLINE			/* Remove compiler warning */
-#  define UNIV_MUST_NOT_INLINE
+//#  define UNIV_MUST_NOT_INLINE
 # endif
 
 # ifdef HAVE_PREAD


--===============0783966037==
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-\
#   trunk-innodb/
# testament_sha1: 232d6960ea4cfd598ba7fbc6b0c3c2f22c59b45a
# timestamp: 2010-12-09 11:29:35 -0600
# source_branch: file:///Users/kevinlewis/Work/Mysql/55222.push/mysql-\
#   5.5-innodb/
# base_revision_id: kevin.lewis@stripped\
#   asj02hptrz37ewub
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQvunkUAAXnfgAAQWmP/91cn
jwC////wUAN6DaXuHTc3LwkomkzU9T1MRglP0JiNNDU9JkaeUbRAMkmTExGmlNDyCBpoABoAAMiD
Qqeo8p6h+VGQAGh6gADQBzAJgBMAAJgACYAAlFE2oZA0Aeo0AAaADQaBhbOnp36RDbxNb1oAEtZz
VVsGnhlZEQet50vZBn1Ucsl/odH3vdz/v4ZRowmOrpcbQmy1EKMPbeDWBu51KYzWs5qwRkgtCipl
VXC/pZ++AnspSPlYxFGfZbXLCeQUdibC+O0RsUyR7qSxe7RHdewxLJj3kHPn7lEttYKlSZGp+1gj
joN3YxrkLEpW09l1i8zq/PdWxfZZxNF55t3B1GgysVOrAzXX4CL5xGmSMRRKzEmsgggYq3BVuTsI
vg7IuBhawLqYJ6Ag3D/HB7y1w1F4ZMjTIVmJnF8EYMHgTCbReJyEzFG3ZdCmVbFolzYnK54CTSsN
a+pIix2Eg0rbeMjXZdAuNy4VA0uAUChjK443UlIxDzAQacDG1fDmNdLtMmi3AMk05q4kBZO+sKK4
VjQQFAmMzDYW7FKRIarxCLikkiIgQkkjzjRfCP53HYr8CVPgg8+qKRtbIPTkOx7JgKSEoo4Ojp7n
UedSY+D5GF0bWBm9nFbQvWb6bteBC5nlP6eKRjookDlQ+lxYOejyXqcGU+EfFM49/hbW1Hsn3fTv
CCv4rTpXJPXEuxZMNLmMSGrkkUWSUa/rLlLTMQY2dTpjk9dNKblWV9WnWOwWshDITTpgKhuAzzGy
ZXXHPOdu3Fh2oqLQOBYzcQ0avy+bL0RQwytYjpqGsbShdTC3HF42gicLRGhPUuNZbze1XDCB8bdm
cwFdFxuL9qNRch3QXBd8UwjAvI7/VMdcUWKQq1iKP4tQYijH83TOrBgn0QfCCKFGYFS0J+E1tYC0
U7kYrhbDUiXQgBcoHNxChIQb4I4a72abHgyBDPcVdfQVc95e4oCELlsqlEBck6ErsxvIchQtm/o3
awBkGA0PH0SbgeFbU+h9TKmMTSSTFTLvToi1axX561JBJX8ZUQxgHZ3AUVNa1gIiBDaCEkvmsGSP
o4BUi87PuwOIZF791acYtSExqrD88A4B4CjN1DWwx2EazSRq8N7V4G+AUxqitEgmCoVwlyFY1CrE
xYyVhsYpXkvgu5IpwoSAX3TyKA==


--===============0783966037==--