Commit d60b10d5 authored by kent@mysql.com's avatar kent@mysql.com

mysqlimport.c:

  Removed C++ comment, changed types for pthread_create() usage
parent bb1ba4bc
...@@ -510,9 +510,9 @@ static char *field_escape(char *to,const char *from,uint length) ...@@ -510,9 +510,9 @@ static char *field_escape(char *to,const char *from,uint length)
} }
int pthread_handler_t worker_thread(void *arg)
worker_thread(char *raw_table_name)
{ {
char *raw_table_name= (char *)arg;
MYSQL *sock= 0; MYSQL *sock= 0;
if (!(sock= db_connect(current_host,current_db,current_user,opt_password))) if (!(sock= db_connect(current_host,current_db,current_user,opt_password)))
{ {
...@@ -562,7 +562,7 @@ int main(int argc, char **argv) ...@@ -562,7 +562,7 @@ int main(int argc, char **argv)
pthread_attr_t attr; /* Thread attributes */ pthread_attr_t attr; /* Thread attributes */
VOID(pthread_mutex_init(&counter_mutex, NULL)); 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. If we hit thread count limit we loop until some threads exit.
...@@ -583,7 +583,7 @@ int main(int argc, char **argv) ...@@ -583,7 +583,7 @@ int main(int argc, char **argv)
PTHREAD_CREATE_DETACHED); PTHREAD_CREATE_DETACHED);
/* now create the thread */ /* now create the thread */
if (pthread_create(&mainthread, &attr, (void *)worker_thread, if (pthread_create(&mainthread, &attr, worker_thread,
(void *)*argv) != 0) (void *)*argv) != 0)
{ {
pthread_mutex_lock(&counter_mutex); pthread_mutex_lock(&counter_mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment