bzr push into mysql-next-mr branch (kevin.lewis:3167 to 3168)

[kevin.lewis]

 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];


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