summaryrefslogtreecommitdiff
path: root/client/mysqlimport.c
diff options
context:
space:
mode:
authorkent@mysql.com <>2006-02-13 20:21:15 +0100
committerkent@mysql.com <>2006-02-13 20:21:15 +0100
commitd60b10d565b94ff67bdc52d2722fc51f6ba56c0e (patch)
treeb09c003664d0dda618655817b70ffc7d28c2c512 /client/mysqlimport.c
parentbb1ba4bc988697da884081c17ea158aaa2e735c4 (diff)
downloadmariadb-git-d60b10d565b94ff67bdc52d2722fc51f6ba56c0e.tar.gz
mysqlimport.c:
Removed C++ comment, changed types for pthread_create() usage
Diffstat (limited to 'client/mysqlimport.c')
-rw-r--r--client/mysqlimport.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/client/mysqlimport.c b/client/mysqlimport.c
index b3074a2effd..fbe15b94111 100644
--- a/client/mysqlimport.c
+++ b/client/mysqlimport.c
@@ -510,9 +510,9 @@ static char *field_escape(char *to,const char *from,uint length)
}
-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 @@ int main(int argc, char **argv)
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 @@ sanity_label:
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);