mirror of
https://github.com/MariaDB/server.git
synced 2026-05-15 19:37:16 +02:00
Portability fix in mysqlbinlog.cc (include my_pthread.h)
Clean up 'unused argument' warnings
Add extern "C" { ... } in my_pthread.h
client/mysqlbinlog.cc:
Include my_pthread.h before thr_alarm.h (otherwise pthread_t isn't
declared yet).
client/mysqltest.c:
Fix unused argument warnings.
client/thread_test.c:
Fix unused argument warnings.
include/my_pthread.h:
Put extern "C" { ... } wrappers, because this file is included from
some C++ files.
This commit is contained in:
parent
3a6db1d65f
commit
65bc433d81
4 changed files with 15 additions and 5 deletions
|
|
@ -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
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue