bk commit into 6.0 tree (vvaintroub:1.2609)

[vvaintroub]

Below is the list of changes that have just been committed into a local
6.0 repository of vvaintroub.  When vvaintroub 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, 2008-03-27 23:34:18+01:00, vvaintroub@stripped +1 -0
  Correct pushbuild warning about pthread_t being output with
  %p in DBUG_PRINT.

  sql/mysqld.cc@stripped, 2008-03-27 23:33:22+01:00, vvaintroub@stripped +4 -4
    Correct pushbuild warning about pthread_t being output as %p.
    pthread_t is an opaque type : some integral datatype on *nix
    and HANDLE on Windows. The safest option to cast it as ulonglong
    and output as 0x%llx. DBUG_PRINT can handle %llx now.

diff -Nrup a/sql/mysqld.cc b/sql/mysqld.cc
--- a/sql/mysqld.cc	2008-03-27 19:39:28 +01:00
+++ b/sql/mysqld.cc	2008-03-27 23:33:22 +01:00
@@ -854,16 +854,16 @@ static void close_connections(void)
   (void) pthread_mutex_lock(&LOCK_manager);
   if (manager_thread_in_use)
   {
-    DBUG_PRINT("quit", ("killing manager thread: %p",
-                        manager_thread));
+    DBUG_PRINT("quit", ("killing manager thread: 0x%llx,
+                        (ulonglong)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: %p",
-                      select_thread));
+  DBUG_PRINT("quit", ("waiting for select thread: 0x%llx",
+                      (ulonglong)select_thread));
   (void) pthread_mutex_lock(&LOCK_thread_count);
 
   while (select_thread_in_use)