diff options
| author | Georgi Kodinov <joro@sun.com> | 2009-10-04 12:15:05 +0300 |
|---|---|---|
| committer | Georgi Kodinov <joro@sun.com> | 2009-10-04 12:15:05 +0300 |
| commit | 370acc8b56a554f236c2f63b9057f3b5155955c4 (patch) | |
| tree | 3c812f47a49f17f16d78645621786d485d0b4432 /client | |
| parent | 91178418a2bfd21852ae03fbcc5a9aa4c26429c6 (diff) | |
| parent | d609fdf98beb8e22c8da42079e08e5dd1f84e16c (diff) | |
| download | mariadb-git-370acc8b56a554f236c2f63b9057f3b5155955c4.tar.gz | |
automerge
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqlimport.c | 4 | ||||
| -rw-r--r-- | client/mysqlslap.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/client/mysqlimport.c b/client/mysqlimport.c index 92e9702aea0..ef38d760e5d 100644 --- a/client/mysqlimport.c +++ b/client/mysqlimport.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2000-2006 MySQL AB +/* Copyright (C) 2000-2006 MySQL AB, 2009 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -583,7 +583,7 @@ error: counter--; pthread_cond_signal(&count_threshhold); pthread_mutex_unlock(&counter_mutex); - my_thread_end(); + mysql_thread_end(); return 0; } diff --git a/client/mysqlslap.c b/client/mysqlslap.c index 28c5e8df79d..5983b911866 100644 --- a/client/mysqlslap.c +++ b/client/mysqlslap.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2005 MySQL AB +/* Copyright (C) 2005 MySQL AB, 2009 Sun Microsystems, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1923,7 +1923,7 @@ end: if (!opt_only_print) mysql_close(mysql); - my_thread_end(); + mysql_thread_end(); pthread_mutex_lock(&counter_mutex); thread_counter--; |