diff options
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mariabackup/backup_mysql.cc | 2 | ||||
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 9 | ||||
| -rw-r--r-- | extra/perror.c | 2 | ||||
| -rw-r--r-- | extra/yassl/src/socket_wrapper.cpp | 1 | ||||
| -rw-r--r-- | extra/yassl/src/yassl_int.cpp | 4 |
5 files changed, 7 insertions, 11 deletions
diff --git a/extra/mariabackup/backup_mysql.cc b/extra/mariabackup/backup_mysql.cc index 415e95f9353..0549b0c5e9c 100644 --- a/extra/mariabackup/backup_mysql.cc +++ b/extra/mariabackup/backup_mysql.cc @@ -800,7 +800,7 @@ wait_for_no_updates(MYSQL *connection, uint timeout, uint threshold) static os_thread_ret_t -kill_query_thread( +DECLARE_THREAD(kill_query_thread)( /*===============*/ void *arg __attribute__((unused))) { diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index 823be4da0bb..5c93a47b626 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -255,8 +255,9 @@ it every INNOBASE_WAKE_INTERVAL'th step. */ #define INNOBASE_WAKE_INTERVAL 32 ulong innobase_active_counter = 0; - +#ifndef _WIN32 static char *xtrabackup_debug_sync = NULL; +#endif my_bool xtrabackup_incremental_force_scan = FALSE; @@ -2455,7 +2456,7 @@ xtrabackup_copy_logfile(copy_logfile copy) return(false); } -static os_thread_ret_t log_copying_thread(void*) +static os_thread_ret_t DECLARE_THREAD(log_copying_thread)(void*) { /* Initialize mysys thread-specific memory so we can @@ -2478,7 +2479,7 @@ static os_thread_ret_t log_copying_thread(void*) } /* io throttle watching (rough) */ -static os_thread_ret_t io_watching_thread(void*) +static os_thread_ret_t DECLARE_THREAD(io_watching_thread)(void*) { /* currently, for --backup only */ ut_a(xtrabackup_backup); @@ -2504,7 +2505,7 @@ static os_thread_ret_t io_watching_thread(void*) Datafiles copying thread.*/ static os_thread_ret_t -data_copy_thread_func( +DECLARE_THREAD(data_copy_thread_func)( /*==================*/ void *arg) /* thread context */ { diff --git a/extra/perror.c b/extra/perror.c index e96002cbb7b..3bc5120db48 100644 --- a/extra/perror.c +++ b/extra/perror.c @@ -204,7 +204,7 @@ static my_bool print_win_error_msg(DWORD error, my_bool verbose) NULL)) { if (verbose) - printf("Win32 error code %d: %s", error, s); + printf("Win32 error code %lu: %s", error, s); else puts(s); LocalFree(s); diff --git a/extra/yassl/src/socket_wrapper.cpp b/extra/yassl/src/socket_wrapper.cpp index a539adab1da..de8025a8353 100644 --- a/extra/yassl/src/socket_wrapper.cpp +++ b/extra/yassl/src/socket_wrapper.cpp @@ -42,7 +42,6 @@ #endif #ifdef _WIN32 - const int SOCKET_EINVAL = WSAEINVAL; const int SOCKET_EWOULDBLOCK = WSAEWOULDBLOCK; const int SOCKET_EAGAIN = WSAEWOULDBLOCK; #else diff --git a/extra/yassl/src/yassl_int.cpp b/extra/yassl/src/yassl_int.cpp index 1dc89df9d86..a9e41fb997a 100644 --- a/extra/yassl/src/yassl_int.cpp +++ b/extra/yassl/src/yassl_int.cpp @@ -921,10 +921,6 @@ static bool setPrefix(opaque* sha_input, int i) return true; } - -const char handshake_order[] = "Out of order HandShake Message!"; - - } // namespcae for locals |