summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/mysqlbinlog.cc1
-rw-r--r--client/mysqltest.c8
-rw-r--r--client/thread_test.c2
3 files changed, 6 insertions, 5 deletions
diff --git a/client/mysqlbinlog.cc b/client/mysqlbinlog.cc
index 757e9dce810..f698ceaf5d4 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 f6d87352a6c..6c5f1c57f6a 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -247,10 +247,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);