bk commit into 5.1 tree (kent:1.2130)

[kent]

Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent 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
  1.2130 06/02/13 20:21:15 kent@stripped +1 -0
  mysqlimport.c:
    Removed C++ comment, changed types for pthread_create() usage

  client/mysqlimport.c
    1.62 06/02/13 20:12:23 kent@stripped +4 -4
    Removed C++ comment, changed types for pthread_create() usage

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	c-754072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-5.1-new

--- 1.61/client/mysqlimport.c	2006-02-13 13:48:09 +01:00
+++ 1.62/client/mysqlimport.c	2006-02-13 20:12:23 +01:00
@@ -510,9 +510,9 @@
 }
 
 
-int
-worker_thread(char *raw_table_name)
+pthread_handler_t worker_thread(void *arg)
 {
+  char *raw_table_name= (char *)arg;
   MYSQL *sock= 0;
   if (!(sock= db_connect(current_host,current_db,current_user,opt_password)))
   {
@@ -562,7 +562,7 @@
     pthread_attr_t attr;          /* Thread attributes */
     VOID(pthread_mutex_init(&counter_mutex, NULL));
 
-    for (; *argv != NULL; argv++) // Loop through tables
+    for (; *argv != NULL; argv++) /* Loop through tables */
     {
       /*
         If we hit thread count limit we loop until some threads exit.
@@ -583,7 +583,7 @@
                                    PTHREAD_CREATE_DETACHED);
 
       /* now create the thread */
-      if (pthread_create(&mainthread, &attr, (void *)worker_thread, 
+      if (pthread_create(&mainthread, &attr, worker_thread, 
                          (void *)*argv) != 0)
       {
         pthread_mutex_lock(&counter_mutex);