diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2009-09-30 22:31:22 +0200 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2009-09-30 22:31:22 +0200 |
| commit | de0285a2e5e9c45a95d44874f86208a58365c084 (patch) | |
| tree | 95a97c9d3acea141bfd3296ea9e5c5f525f47b60 /client/mysqlslap.c | |
| parent | 309ffb8b13f0fd035748a940f39f96011e58873b (diff) | |
| parent | 650e68b7dc2987aaa2daf2b270384f63957f7b51 (diff) | |
| download | mariadb-git-de0285a2e5e9c45a95d44874f86208a58365c084.tar.gz | |
Merge "trunk-build" up into "next-mr".
Diffstat (limited to 'client/mysqlslap.c')
| -rw-r--r-- | client/mysqlslap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/mysqlslap.c b/client/mysqlslap.c index 6a016b72383..0bbc15eb24e 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 @@ -1918,7 +1918,7 @@ end: if (!opt_only_print) mysql_close(mysql); - my_thread_end(); + mysql_thread_end(); pthread_mutex_lock(&counter_mutex); thread_counter--; |