From: kevin.lewis
Date: July 14 2010 3:00pm
Subject: bzr push into mysql-next-mr branch (kevin.lewis:3167 to 3168)
List-Archive: http://lists.mysql.com/commits/113601
Message-Id: <20100714150034.0B4903E4965@kevin-lewis-macbook.local>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1397695320=="

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

 3168 kevin.lewis@stripped	2010-07-14
      compiler warning

    modified:
      sql/table_share_builder.cc
 3167 kevin.lewis@stripped	2010-07-13
      WL#4034 - Add table_share_builder.cc to libmysqld/CMakeLists.txt 
      and libmysqld/Makefile.am

    modified:
      libmysqld/CMakeLists.txt
      libmysqld/Makefile.am
=== modified file 'sql/table_share_builder.cc'
--- a/sql/table_share_builder.cc	2010-07-12 15:48:26 +0000
+++ b/sql/table_share_builder.cc	2010-07-14 15:00:14 +0000
@@ -434,7 +434,7 @@ void table_share_builder::init_key_part(
 
   DBUG_ASSERT(m_key_num < (int) m_key_count);
   DBUG_ASSERT(m_key_part_num < (int) m_key_part_count);
-  DBUG_ASSERT(field_num < (int) m_field_count);
+  DBUG_ASSERT(field_num < m_field_count);
 
   KEY_PART_INFO *key_part_info= &m_key_part_info[m_key_part_num];
   Field *field= m_share->field[field_num];


--===============1397695320==
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/Merge/mysql-next-\
#   mr-wl4034/
# testament_sha1: 4b784b92618ea4ee1169cfb2a9eb9c15f21a2b14
# timestamp: 2010-07-14 10:00:34 -0500
# source_branch: file:///Users/kevinlewis/Work/Mysql/Clean/mysql-next-\
#   mr/
# base_revision_id: kevin.lewis@stripped\
#   b8vc3l2wgmxfqdsv
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRmEOjkAAXDfgAAQUGP//3aA
HgC////wUAM6moWGvPeOwyUyTTKemNU81DTKemmU/VGTTanoJiZBJSaIzJiaJoaRoDQGgAGgJJNU
81A0k2Ip+iCDTNQ9TQGgAZKnhIZA0wmjRo0Gg9QGgAJKieoMmIGjT1DRkA0AABsOGjfSvmY5ut9c
rwMtHeTy0aOrxvZmPr5L8bKWSMXd35N++PjC2XqhCRRzSq0aLg8gO+W6jmIbhQCOlUB2A6oaQ1PP
XXgtLZcki5I3ND6d0xV1lt7BOC7lVgUpCrOSSgdTmvuZ0eR4XCbtmC57zTj2yeuNIxjOayJij7Kk
W8+bbRPczbOcTZqMVH6hjrrFE0K0FucZQnA4303UycIwt36LbsGKLvK6z1GWJwg1kWYXNtHWZGtK
LFcwCA++tg04X0wKx0aTEeNRnGYFM2cDJ+gsFmKODG3htqp2yTS6k6BRz55ywrnJVF8FjWaxMnOC
dVcSzTA/IuDYhb4OaslfKSwL7nymmFdLR9BOoabhOa+hxNTqwZcSFCBRInSZmzgP6jMK9z1bXA0a
YqYuQSTQ0yYUhulehxyu56J/D580j97LWCInPpGvt3W9172d4DLWydZC5rVrKPAVCtrq9dfmE48C
RG4wSLAxZlV8sMRHCg59uBTM5M8RbcbgN74dgVbdwjrH5bbhBqqYiEiAkMDOQ1snshZ6FZSZZwE6
GSVr4rCYnGAg6fENMa5uMeQOtb7uDzjJIAhc2ldMyMk5UqE+aFkbqDUXFqYrucL8H5VuJJFgWJEr
FViaYwZULn0vsGRoeGm8TBmv+7W8aqHhf5KWEL+jLLPuBT2Jy/ALRIsLXCUhfjW8diKzxQqikYR5
0icIoGtusvBLIkPBMyfANLYoxpXgDwcRx0aFA+D6ihCFgpggSCBxRxIzxT2U4AikT6C8uG2I6Fwt
aFPS7yu0xCQhuhwekhohsMkTZcJLCtM0LYHvc/yR7AhdkljZbruyZk5PlK8VvU9O311V5G/OxhQY
JLrmBdy2kb4VY8s516Css9DLxRJIjdPpPb1sXhYDWLn30/VxYiZmYLeAKlKDohMqNovwBbE2yURA
ZgFIaLGVGx+HLfsHEqLDKSdeAXcNBYSMlJcFANKo4gv+LuSKcKEgMwh0cg==


--===============1397695320==--