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 | 3fddd102689ddf23e8e96fa74c5a0d20c98ca1d9 (patch) | |
| tree | 95a97c9d3acea141bfd3296ea9e5c5f525f47b60 /client | |
| parent | 1f49cf7409befeb2cb392f8615a69eb2d530ffe5 (diff) | |
| parent | a6f7fbb85014a68c18d37f18d5b7809066552356 (diff) | |
| download | mariadb-git-3fddd102689ddf23e8e96fa74c5a0d20c98ca1d9.tar.gz | |
Merge "trunk-build" up into "next-mr".
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqlimport.c | 4 | ||||
| -rw-r--r-- | client/mysqlslap.c | 4 | ||||
| -rw-r--r-- | client/mysqltest.cc | 2 |
3 files changed, 5 insertions, 5 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 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--; diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 3812a1bb8d1..9e8f31178ad 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -1535,7 +1535,7 @@ void show_diff(DYNAMIC_STRING* ds, else diff_name = 0; #else - diff_name = "diff"; // Otherwise always assume it's called diff + diff_name = "diff"; /* Otherwise always assume it's called diff */ #endif if (diff_name) |