Post-merge fixes

sql/ha_partition.cc:
  Post-merge fix (remove duplicate definition of ::column_bitmaps_signal)
sql/mysqld.cc:
  Post-merge fix (cast away some compiler warnings in DBUG_PRINT, remove
  duplicate definition of OPT_KEEP_FILES_ON_CREATE).

sql/ha_partition.cc

@@ -5601,13 +5601,6 @@ int ha_partition::indexes_are_disabled(void)
 }
 
 
-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
 ****************************************************************************/

sql/mysqld.cc

@@ -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
 };