diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-25 18:03:05 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-25 18:03:05 +0300 |
| commit | 52c66b56710046034fc631df4f3a165ba5a704f7 (patch) | |
| tree | b7488b7a2e23cf4b596766c1c84f64235543757a /client/mysqltest.cc | |
| parent | 72a26125e21fc4c654a8a1c9c1841f79f62d4d7a (diff) | |
| parent | be0add42f53b23d8a5e279cb3041a3fc93e375a0 (diff) | |
| download | mariadb-git-52c66b56710046034fc631df4f3a165ba5a704f7.tar.gz | |
Manual merge/pull from mysql-next-mr.
Conflicts:
- sql/sql_insert.cc
Diffstat (limited to 'client/mysqltest.cc')
| -rw-r--r-- | client/mysqltest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 4d104704c56..79ee7fe9990 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -696,12 +696,12 @@ pthread_handler_t send_one_query(void *arg) struct st_connection *cn= (struct st_connection*)arg; mysql_thread_init(); - VOID(mysql_send_query(&cn->mysql, cn->cur_query, cn->cur_query_len)); + (void) mysql_send_query(&cn->mysql, cn->cur_query, cn->cur_query_len); mysql_thread_end(); pthread_mutex_lock(&cn->mutex); cn->query_done= 1; - VOID(pthread_cond_signal(&cn->cond)); + pthread_cond_signal(&cn->cond); pthread_mutex_unlock(&cn->mutex); pthread_exit(0); return 0; @@ -9065,7 +9065,7 @@ REPLACE *init_replace(char * *from, char * *to,uint count, free_sets(&sets); DBUG_RETURN(0); } - VOID(make_new_set(&sets)); /* Set starting set */ + (void) make_new_set(&sets); /* Set starting set */ make_sets_invisible(&sets); /* Hide previus sets */ used_sets=-1; word_states=make_new_set(&sets); /* Start of new word */ @@ -9536,7 +9536,7 @@ int insert_pointer_name(reg1 POINTER_ARRAY *pa,char * name) pa->flag[pa->typelib.count]=0; /* Reset flag */ pa->typelib.type_names[pa->typelib.count++]= (char*) pa->str+pa->length; pa->typelib.type_names[pa->typelib.count]= NullS; /* Put end-mark */ - VOID(strmov((char*) pa->str+pa->length,name)); + (void) strmov((char*) pa->str+pa->length,name); pa->length+=length; DBUG_RETURN(0); } /* insert_pointer_name */ |