diff options
| author | unknown <tim@white.box> | 2001-08-21 19:24:35 -0400 |
|---|---|---|
| committer | unknown <tim@white.box> | 2001-08-21 19:24:35 -0400 |
| commit | 269e914b3d59bf45f7d887c3be1d34004d85191d (patch) | |
| tree | f63e37772831e7183bdf7008ecb9e7c0ef3081e6 /client | |
| parent | d85006f2549dd708e356a645192bbdd838aee5fb (diff) | |
| parent | 65bc433d812251e87920198b9c3ab981b142cc80 (diff) | |
| download | mariadb-git-269e914b3d59bf45f7d887c3be1d34004d85191d.tar.gz | |
Merge
client/mysqlbinlog.cc:
SCCS merged
client/mysqltest.c:
SCCS merged
include/my_pthread.h:
SCCS merged
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqlbinlog.cc | 1 | ||||
| -rw-r--r-- | client/mysqltest.c | 8 | ||||
| -rw-r--r-- | client/thread_test.c | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc index f55a5a3f7c4..db28184f3e7 100644 --- a/client/mysqlbinlog.cc +++ b/client/mysqlbinlog.cc @@ -21,6 +21,7 @@ #include <m_string.h> #include <my_sys.h> #include <getopt.h> +#include <my_pthread.h> #include <thr_alarm.h> #include <mysql.h> #include "log_event.h" diff --git a/client/mysqltest.c b/client/mysqltest.c index 2d8c4e00416..7d149fe6f66 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -251,10 +251,10 @@ static int eval_result = 0; /* Disable functions that only exist in MySQL 4.0 */ #if MYSQL_VERSION_ID < 40000 -static void mysql_enable_rpl_parse(MYSQL* mysql) {} -static void mysql_disable_rpl_parse(MYSQL* mysql) {} -static int mysql_rpl_parse_enabled(MYSQL* mysql) { return 1; } -static int mysql_rpl_probe(MYSQL *mysql) { return 1; } +static void mysql_enable_rpl_parse(MYSQL* mysql __attribute__((unused))) {} +static void mysql_disable_rpl_parse(MYSQL* mysql __attribute__((unused))) {} +static int mysql_rpl_parse_enabled(MYSQL* mysql __attribute__((unused))) { return 1; } +static int mysql_rpl_probe(MYSQL *mysql __attribute__((unused))) { return 1; } #endif diff --git a/client/thread_test.c b/client/thread_test.c index 4d3ae6e7ddd..dbe2acee8db 100644 --- a/client/thread_test.c +++ b/client/thread_test.c @@ -19,7 +19,7 @@ #ifndef THREAD -int main(int argc, char **argv) +int main(void) { printf("This test must be compiled with multithread support to work\n"); exit(1); |