bk commit into 5.1 tree (tsmith:1.2579)

[tim]

Below is the list of changes that have just been committed into a local
5.1 repository of tsmith. When tsmith does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-08-28 01:02:57-06:00, tsmith@stripped +2 -0
  Post-merge fixes

  sql/ha_partition.cc@stripped, 2007-08-28 01:02:52-06:00, tsmith@stripped +0 -7
    Post-merge fix (remove duplicate definition of ::column_bitmaps_signal)

  sql/mysqld.cc@stripped, 2007-08-28 01:02:53-06:00, tsmith@stripped +5 -4
    Post-merge fix (cast away some compiler warnings in DBUG_PRINT, remove
    duplicate definition of OPT_KEEP_FILES_ON_CREATE).

diff -Nrup a/sql/ha_partition.cc b/sql/ha_partition.cc
--- a/sql/ha_partition.cc	2007-08-27 18:33:53 -06:00
+++ b/sql/ha_partition.cc	2007-08-28 01:02:52 -06:00
@@ -5601,13 +5601,6 @@ int ha_partition::indexes_are_disabled(v
 }
 
 
-void ha_partition::column_bitmaps_signal()
-{
-    handler::column_bitmaps_signal();
-    bitmap_union(table->read_set, &m_part_info->full_part_field_set);
-}
-
-
 /****************************************************************************
                 MODULE Partition Share
 ****************************************************************************/
diff -Nrup a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc	2007-08-27 18:33:53 -06:00
+++ b/sql/mysqld.cc	2007-08-28 01:02:53 -06:00
@@ -746,14 +746,16 @@ static void close_connections(void)
   (void) pthread_mutex_lock(&LOCK_manager);
   if (manager_thread_in_use)
   {
-    DBUG_PRINT("quit",("killing manager thread: 0x%lx",manager_thread));
+    DBUG_PRINT("quit", ("killing manager thread: 0x%lx",
+                        (ulong)manager_thread));
    (void) pthread_cond_signal(&COND_manager);
   }
   (void) pthread_mutex_unlock(&LOCK_manager);
 
   /* kill connection thread */
 #if !defined(__WIN__) && !defined(__NETWARE__)
-  DBUG_PRINT("quit",("waiting for select thread: 0x%lx",select_thread));
+  DBUG_PRINT("quit", ("waiting for select thread: 0x%lx",
+                      (ulong) select_thread));
   (void) pthread_mutex_lock(&LOCK_thread_count);
 
   while (select_thread_in_use)
@@ -5087,8 +5089,7 @@ enum options_mysqld
   OPT_SECURE_FILE_PRIV,
   OPT_MIN_EXAMINED_ROW_LIMIT,
   OPT_LOG_SLOW_SLAVE_STATEMENTS,
-  OPT_OLD_MODE,
-  OPT_KEEP_FILES_ON_CREATE
+  OPT_OLD_MODE
 };