diff options
31 files changed, 57 insertions, 145 deletions
diff --git a/extra/yassl/src/timer.cpp b/extra/yassl/src/timer.cpp index c1286b0724c..945cc8c8b0b 100644 --- a/extra/yassl/src/timer.cpp +++ b/extra/yassl/src/timer.cpp @@ -24,7 +24,7 @@ #include "timer.hpp" #ifdef _WIN32 -#define WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN 1 #include <windows.h> #else #include <sys/time.h> diff --git a/include/my_base.h b/include/my_base.h index fad2cd99d55..c71df96dbed 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -19,8 +19,6 @@ #ifndef _my_base_h #define _my_base_h -#ifndef stdin /* Included first in handler */ -#define CHSIZE_USED #include <my_global.h> #include <my_dir.h> /* This includes types */ #include <my_sys.h> @@ -31,7 +29,6 @@ #define EOVERFLOW 84 #endif -#endif /* stdin */ #include <my_list.h> /* The following is bits in the flag parameter to ha_open() */ diff --git a/include/my_pthread.h b/include/my_pthread.h index 9f851db4209..21c85c633d6 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -91,21 +91,6 @@ struct timespec { long tv_nsec; }; - -/** - Compare two timespec structs. - - @retval 1 If TS1 ends after TS2. - - @retval 0 If TS1 is equal to TS2. - - @retval -1 If TS1 ends before TS2. -*/ -#define cmp_timespec(TS1, TS2) \ - ((TS1.tv.i64 > TS2.tv.i64) ? 1 : \ - ((TS1.tv.i64 < TS2.tv.i64) ? -1 : 0)) - - int win_pthread_mutex_trylock(pthread_mutex_t *mutex); int pthread_create(pthread_t *, const pthread_attr_t *, pthread_handler, void *); int pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr); diff --git a/include/mysql/plugin.h b/include/mysql/plugin.h index 32228b63428..2e5e6b5c9b0 100644 --- a/include/mysql/plugin.h +++ b/include/mysql/plugin.h @@ -122,9 +122,9 @@ int PSIZE= sizeof(struct st_mysql_plugin); \ struct st_mysql_plugin DECLS[]= { #define MARIA_DECLARE_PLUGIN__(NAME, VERSION, PSIZE, DECLS) \ -int VERSION= MARIA_PLUGIN_INTERFACE_VERSION; \ -int PSIZE= sizeof(struct st_maria_plugin); \ -struct st_maria_plugin DECLS[]= { +MYSQL_PLUGIN_EXPORT int VERSION= MARIA_PLUGIN_INTERFACE_VERSION; \ +MYSQL_PLUGIN_EXPORT int PSIZE= sizeof(struct st_maria_plugin); \ +MYSQL_PLUGIN_EXPORT struct st_maria_plugin DECLS[]= { #else #define __MYSQL_DECLARE_PLUGIN(NAME, VERSION, PSIZE, DECLS) \ diff --git a/include/mysql/plugin_auth_common.h b/include/mysql/plugin_auth_common.h index 3c87fe7e094..2f6642abac1 100644 --- a/include/mysql/plugin_auth_common.h +++ b/include/mysql/plugin_auth_common.h @@ -15,6 +15,10 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#ifdef _WIN32 +#include <windows.h> +#endif + /** @file diff --git a/include/mysql_com.h b/include/mysql_com.h index e4f065e3e93..1ffb6557117 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -56,6 +56,9 @@ #define LOCAL_HOST "localhost" #define LOCAL_HOST_NAMEDPIPE "." +#ifdef _WIN32 +#include <ws2tcpip.h> +#endif #if defined(__WIN__) && !defined( _CUSTOMCONFIG_) #define MYSQL_NAMEDPIPE "MySQL" diff --git a/plugin/auth_dialog/dialog.c b/plugin/auth_dialog/dialog.c index 48e9c4a3882..9f974f6898f 100644 --- a/plugin/auth_dialog/dialog.c +++ b/plugin/auth_dialog/dialog.c @@ -24,31 +24,15 @@ asks the user the question, as provided by the server and reports the answer back to the server. No encryption is involved, the answers are sent in clear text. - - Two examples are provided: two_questions server plugin, that asks - the password and an "Are you sure?" question with a reply "yes, of course". - It demonstrates the usage of "password" (input is hidden) and "ordinary" - (input can be echoed) questions, and how to mark the last question, - to avoid an extra roundtrip. - - And three_attempts plugin that gives the user three attempts to enter - a correct password. It shows the situation when a number of questions - is not known in advance. */ -#if defined (WIN32) && !defined (RTLD_DEFAULT) -# define RTLD_DEFAULT GetModuleHandle(NULL) -#endif - -#if !defined (_GNU_SOURCE) -# define _GNU_SOURCE /* for RTLD_DEFAULT */ -#endif - +#include <my_global.h> #include <mysql/client_plugin.h> -#include <string.h> -#include <stdio.h> -#include <stdlib.h> #include <mysql.h> -#include <dlfcn.h> +#include <string.h> + +#if defined (_WIN32) +# define RTLD_DEFAULT GetModuleHandle(NULL) +#endif /* This plugin performs a dialog with the user, asking questions and diff --git a/plugin/semisync/semisync_master.cc b/plugin/semisync/semisync_master.cc index 2701c575b7a..bfdea128e68 100644 --- a/plugin/semisync/semisync_master.cc +++ b/plugin/semisync/semisync_master.cc @@ -47,11 +47,7 @@ static int getWaitTime(const struct timespec& start_ts); static unsigned long long timespec_to_usec(const struct timespec *ts) { -#ifndef __WIN__ return (unsigned long long) ts->tv_sec * TIME_MILLION + ts->tv_nsec / TIME_THOUSAND; -#else - return ts->tv.i64 / 10; -#endif /* __WIN__ */ } /******************************************************************************* @@ -678,10 +674,6 @@ int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name, } /* Calcuate the waiting period. */ -#ifdef __WIN__ - abstime.tv.i64 = start_ts.tv.i64 + (__int64)wait_timeout_ * TIME_THOUSAND * 10; - abstime.max_timeout_msec= (long)wait_timeout_; -#else unsigned long long diff_nsecs = start_ts.tv_nsec + (unsigned long long)wait_timeout_ * TIME_MILLION; abstime.tv_sec = start_ts.tv_sec; @@ -691,7 +683,6 @@ int ReplSemiSyncMaster::commitTrx(const char* trx_wait_binlog_name, diff_nsecs -= TIME_BILLION; } abstime.tv_nsec = diff_nsecs; -#endif /* __WIN__ */ /* In semi-synchronous replication, we wait until the binlog-dump * thread has received the reply on the relevant binlog segment from the diff --git a/plugin/win_auth_client/CMakeLists.txt b/plugin/win_auth_client/CMakeLists.txt index 4541e23e94c..1e65673adbd 100644 --- a/plugin/win_auth_client/CMakeLists.txt +++ b/plugin/win_auth_client/CMakeLists.txt @@ -28,7 +28,7 @@ IF(WIN32) log_client.cc common.cc handshake.cc) MYSQL_ADD_PLUGIN(authentication_windows_client ${PLUGIN_SOURCES} ${HEADERS} - LINK_LIBRARUES Secur32 + LINK_LIBRARIES Secur32 MODULE_ONLY) ENDIF(WIN32) diff --git a/sql/CMakeLists.txt b/sql/CMakeLists.txt index 90202d8aa7b..7c97aea0c8d 100644 --- a/sql/CMakeLists.txt +++ b/sql/CMakeLists.txt @@ -100,6 +100,7 @@ TARGET_LINK_LIBRARIES(sql ${MYSQLD_STATIC_PLUGIN_LIBS} IF(WIN32) SET(MYSQLD_SOURCE main.cc nt_servc.cc nt_servc.h message.rc) + TARGET_LINK_LIBRARIES(sql psapi) ELSE() SET(MYSQLD_SOURCE main.cc ${DTRACE_PROBES_ALL}) ENDIF() diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 0df4a655191..20090d0f313 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2753,6 +2753,7 @@ extern "C" char *my_demangle(const char *mangled_name, int *status) } #endif +extern const char *optimizer_switch_names[]; extern "C" sig_handler handle_segfault(int sig) { @@ -2859,7 +2860,6 @@ the thread stack. Please read http://dev.mysql.com/doc/mysql/en/linux.html\n\n", fprintf(stderr, "Status: %s\n", kreason); fprintf(stderr, "Optimizer switch: "); - extern const char *optimizer_switch_names[]; ulonglong optsw= global_system_variables.optimizer_switch; for (uint i= 0; optimizer_switch_names[i+1]; i++, optsw >>= 1) { diff --git a/sql/net_serv.cc b/sql/net_serv.cc index f8a55868113..ccc67e64ea4 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -59,7 +59,7 @@ #define EXTRA_DEBUG_fflush fflush #else static void inline EXTRA_DEBUG_fprintf(...) {} -static int EXTRA_DEBUG_fflush(...) {} +static int inline EXTRA_DEBUG_fflush(...) { return 0; } #endif #ifdef MYSQL_SERVER #define MYSQL_SERVER_my_error my_error diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index 0756b77180a..48b88060a69 100644 --- a/storage/federated/ha_federated.cc +++ b/storage/federated/ha_federated.cc @@ -3027,8 +3027,19 @@ int ha_federated::delete_all_rows() } + + /* - The idea with handler::store_lock() is the following: + Used to manually truncate the table via a delete of all rows in a table. +*/ + +int ha_federated::truncate() +{ + return delete_all_rows(); +} + + +/* The idea with handler::store_lock() is the following: The statement decided which locks we should need for the table for updates/deletes/inserts we get WRITE locks, for SELECT... we get diff --git a/storage/maria/CMakeLists.txt b/storage/maria/CMakeLists.txt index 3fbddaf4580..7f6e35b0a31 100644 --- a/storage/maria/CMakeLists.txt +++ b/storage/maria/CMakeLists.txt @@ -42,7 +42,7 @@ SET(ARIA_SOURCES ma_init.c ma_open.c ma_extra.c ma_info.c ma_rkey.c ) MYSQL_ADD_PLUGIN(aria ${ARIA_SOURCES} - STORAGE_ENGINE + STORAGE_ENGINE STATIC_ONLY DEFAULT RECOMPILE_FOR_EMBEDDED) TARGET_LINK_LIBRARIES(aria myisam) diff --git a/storage/maria/unittest/ma_pagecache_consist.c b/storage/maria/unittest/ma_pagecache_consist.c index 60c196fddbf..6a25a47591c 100644 --- a/storage/maria/unittest/ma_pagecache_consist.c +++ b/storage/maria/unittest/ma_pagecache_consist.c @@ -395,7 +395,7 @@ int main(int argc __attribute__((unused)), pagecache_file_init(file1, &dummy_callback, &dummy_callback, &dummy_fail_callback, &dummy_callback, NULL); DBUG_PRINT("info", ("file1: %d", file1.file)); - if (my_chmod(file1_name, S_IRWXU | S_IRWXG | S_IRWXO, MYF(MY_WME))) + if (my_chmod(file1_name, 0777, MYF(MY_WME))) exit(1); my_pwrite(file1.file, (const uchar *)"test file", 9, 0, MYF(0)); diff --git a/storage/maria/unittest/ma_pagecache_rwconsist.c b/storage/maria/unittest/ma_pagecache_rwconsist.c index 4ade9c536ed..7afdbfd0ac1 100644 --- a/storage/maria/unittest/ma_pagecache_rwconsist.c +++ b/storage/maria/unittest/ma_pagecache_rwconsist.c @@ -265,7 +265,7 @@ int main(int argc __attribute__((unused)), pagecache_file_init(file1, &dummy_callback, &dummy_callback, &dummy_fail_callback, &dummy_callback, NULL); DBUG_PRINT("info", ("file1: %d", file1.file)); - if (my_chmod(file1_name, S_IRWXU | S_IRWXG | S_IRWXO, MYF(MY_WME))) + if (my_chmod(file1_name, 0777, MYF(MY_WME))) exit(1); my_pwrite(file1.file, (const uchar*) "test file", 9, 0, MYF(0)); diff --git a/storage/maria/unittest/ma_pagecache_rwconsist2.c b/storage/maria/unittest/ma_pagecache_rwconsist2.c index a5c50bc15da..917fddd0bcf 100644 --- a/storage/maria/unittest/ma_pagecache_rwconsist2.c +++ b/storage/maria/unittest/ma_pagecache_rwconsist2.c @@ -261,7 +261,7 @@ int main(int argc __attribute__((unused)), pagecache_file_init(file1, &dummy_callback, &dummy_callback, &dummy_fail_callback, &dummy_callback, NULL); DBUG_PRINT("info", ("file1: %d", file1.file)); - if (my_chmod(file1_name, S_IRWXU | S_IRWXG | S_IRWXO, MYF(MY_WME))) + if (my_chmod(file1_name, 0777, MYF(MY_WME))) exit(1); my_pwrite(file1.file, (const uchar*) "test file", 9, 0, MYF(0)); diff --git a/storage/maria/unittest/ma_pagecache_single.c b/storage/maria/unittest/ma_pagecache_single.c index bb39b20ce59..d7da87a3821 100644 --- a/storage/maria/unittest/ma_pagecache_single.c +++ b/storage/maria/unittest/ma_pagecache_single.c @@ -792,7 +792,7 @@ int main(int argc __attribute__((unused)), my_delete(file2_name, MYF(0)); DBUG_PRINT("info", ("file1: %d", file1.file)); - if (my_chmod(file1_name, S_IRWXU | S_IRWXG | S_IRWXO, MYF(MY_WME))) + if (my_chmod(file1_name, 0777, MYF(MY_WME))) exit(1); my_pwrite(file1.file, (const uchar*)"test file", 9, 0, MYF(MY_WME)); diff --git a/storage/maria/unittest/ma_test_loghandler_pagecache-t.c b/storage/maria/unittest/ma_test_loghandler_pagecache-t.c index 0cc94befb39..a939cef71a7 100644 --- a/storage/maria/unittest/ma_test_loghandler_pagecache-t.c +++ b/storage/maria/unittest/ma_test_loghandler_pagecache-t.c @@ -154,7 +154,7 @@ int main(int argc __attribute__((unused)), char *argv[]) } pagecache_file_init(file1, &dummy_callback, &dummy_callback, &dummy_fail_callback, maria_flush_log_for_page, NULL); - if (my_chmod(file1_name, S_IRWXU | S_IRWXG | S_IRWXO, MYF(MY_WME))) + if (my_chmod(file1_name, 0777, MYF(MY_WME))) exit(1); { diff --git a/storage/oqgraph/CMakeLists.txt b/storage/oqgraph/CMakeLists.txt index c791081d4ca..91704d75750 100644 --- a/storage/oqgraph/CMakeLists.txt +++ b/storage/oqgraph/CMakeLists.txt @@ -15,12 +15,11 @@ IF(BOOST_OK) ADD_DEFINITIONS(-DHAVE_OQGRAPH) IF(MSVC) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc") - ENDIF(MSVC) - IF(CMAKE_CXX_FLAGS) + ELSE(MSVC) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated") STRING(REPLACE "-fno-exceptions" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) STRING(REPLACE "-fno-implicit-templates" "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated") - ENDIF() + ENDIF(MSVC) MYSQL_ADD_PLUGIN(oqgraph ha_oqgraph.cc graphcore.cc STORAGE_ENGINE MODULE_ONLY) diff --git a/storage/pbxt/CMakeLists.txt b/storage/pbxt/CMakeLists.txt index b87c0810c29..6ddb679bc36 100644 --- a/storage/pbxt/CMakeLists.txt +++ b/storage/pbxt/CMakeLists.txt @@ -90,6 +90,5 @@ src/xt_config.h src/xt_defs.h src/xt_errno.h) -SET(PBXT_PLUGIN_STATIC "pbxt") -MYSQL_ADD_PLUGIN(pbxt ${PBXT_SOURCES} STORAGE_ENGINE) +MYSQL_ADD_PLUGIN(pbxt ${PBXT_SOURCES} STORAGE_ENGINE STATIC_ONLY) diff --git a/storage/pbxt/src/datalog_xt.cc b/storage/pbxt/src/datalog_xt.cc index 449eaa9450c..aa54182b893 100644 --- a/storage/pbxt/src/datalog_xt.cc +++ b/storage/pbxt/src/datalog_xt.cc @@ -26,8 +26,8 @@ #include <stdio.h> #ifndef XT_WIN #include <unistd.h> -#include <signal.h> #endif +#include <signal.h> #include <stdlib.h> #ifndef DRIZZLED diff --git a/storage/pbxt/src/pthread_xt.cc b/storage/pbxt/src/pthread_xt.cc index d704e977c21..aad87fca5f8 100755 --- a/storage/pbxt/src/pthread_xt.cc +++ b/storage/pbxt/src/pthread_xt.cc @@ -45,22 +45,16 @@ xtPublic void xt_p_init_threading(void) xtPublic int xt_p_set_normal_priority(pthread_t thr) { - if (!SetThreadPriority (thr, THREAD_PRIORITY_NORMAL)) - return GetLastError(); return 0; } xtPublic int xt_p_set_low_priority(pthread_t thr) { - if (!SetThreadPriority (thr, THREAD_PRIORITY_LOWEST)) - return GetLastError(); return 0; } xtPublic int xt_p_set_high_priority(pthread_t thr) { - if (!SetThreadPriority (thr, THREAD_PRIORITY_HIGHEST)) - return GetLastError(); return 0; } @@ -401,31 +395,7 @@ xtPublic int xt_p_cond_timedwait(xt_cond_type *cond, xt_mutex_type *mt, struct t xtPublic int xt_p_join(pthread_t thread, void **value) { - DWORD exitcode; - - while(1) { - switch (WaitForSingleObject(thread, 10000)) { - case WAIT_OBJECT_0: - return 0; - case WAIT_TIMEOUT: - /* Don't do this! According to the Win docs: - * _endthread automatically closes the thread handle - * (whereas _endthreadex does not). Therefore, when using - * _beginthread and _endthread, do not explicitly close the - * thread handle by calling the Win32 CloseHandle API. - CloseHandle(thread); - */ - /* This is done so that if the thread was not [yet] in the running - * state when this function was called we won't deadlock here. - */ - if (GetExitCodeThread(thread, &exitcode) && (exitcode == STILL_ACTIVE)) - break; - return 0; - case WAIT_FAILED: - return GetLastError(); - } - } - + pthread_join(thread, value); return 0; } diff --git a/storage/pbxt/src/thread_xt.cc b/storage/pbxt/src/thread_xt.cc index eb9941f13fb..1addf487153 100644 --- a/storage/pbxt/src/thread_xt.cc +++ b/storage/pbxt/src/thread_xt.cc @@ -1513,16 +1513,7 @@ xtPublic pthread_t xt_run_thread(XTThreadPtr self, XTThreadPtr child, void *(*st data.td_started = FALSE; data.td_thr = child; data.td_start_routine = start_routine; -#ifdef XT_WIN - { - pthread_attr_t attr = { 0, 0, 0 }; - - attr.priority = THREAD_PRIORITY_NORMAL; - err = pthread_create(&child_thread, &attr, xt_thread_main, &data); - } -#else err = pthread_create(&child_thread, NULL, xt_thread_main, &data); -#endif if (err) { xt_free_thread(child); xt_throw_errno(XT_CONTEXT, err); diff --git a/storage/sphinx/ha_sphinx.cc b/storage/sphinx/ha_sphinx.cc index 3d3c0da8496..e90c2f3e6fb 100644 --- a/storage/sphinx/ha_sphinx.cc +++ b/storage/sphinx/ha_sphinx.cc @@ -26,10 +26,10 @@ #include "field.h" #include "item.h" #include <mysqld_error.h> +#include <my_net.h> #ifndef __WIN__ // UNIX-specific - #include <my_net.h> #include <netdb.h> #include <sys/un.h> @@ -39,8 +39,6 @@ #else // Windows-specific #include <io.h> - #define strcasecmp stricmp - #define snprintf _snprintf #define RECV_FLAGS 0 diff --git a/storage/xtradb/CMakeLists.txt b/storage/xtradb/CMakeLists.txt index ecca0d05e63..b55f31e08d1 100644 --- a/storage/xtradb/CMakeLists.txt +++ b/storage/xtradb/CMakeLists.txt @@ -259,5 +259,5 @@ IF(WITH_INNODB) SET(WITH_INNOBASE_STORAGE_ENGINE TRUE) ENDIF() -MYSQL_ADD_PLUGIN(xtradb ${INNOBASE_SOURCES} STORAGE_ENGINE +MYSQL_ADD_PLUGIN(xtradb ${INNOBASE_SOURCES} STORAGE_ENGINE DEFAULT LINK_LIBRARIES ${ZLIB_LIBRARY}) diff --git a/storage/xtradb/log/log0recv.c b/storage/xtradb/log/log0recv.c index 0c0b83e34b7..9c48d06eb45 100644 --- a/storage/xtradb/log/log0recv.c +++ b/storage/xtradb/log/log0recv.c @@ -29,6 +29,13 @@ Created 9/20/1997 Heikki Tuuri #include "log0recv.ic" #endif +#include "config.h" +#ifdef HAVE_ALLOCA_H +#include "alloca.h" +#else +#include "malloc.h" +#endif + #include "mem0mem.h" #include "buf0buf.h" #include "buf0flu.h" diff --git a/storage/xtradb/os/os0file.c b/storage/xtradb/os/os0file.c index 909c72fcdbb..ee8ee34ea49 100644 --- a/storage/xtradb/os/os0file.c +++ b/storage/xtradb/os/os0file.c @@ -37,7 +37,7 @@ Created 10/21/1995 Heikki Tuuri #ifdef UNIV_NONINL #include "os0file.ic" #endif - +#include "ha_prototypes.h" #include "ut0mem.h" #include "srv0srv.h" #include "srv0start.h" @@ -1601,7 +1601,7 @@ try_again: } } else { *success = TRUE; - if (os_aio_use_native_aio && ((attributes & FILE_FLAG_OVERLAPPED) != 0)) { + if (srv_use_native_aio && ((attributes & FILE_FLAG_OVERLAPPED) != 0)) { ut_a(CreateIoCompletionPort(file, completion_port, 0, 0)); } } @@ -4286,18 +4286,6 @@ os_aio_windows_handle( ret = GetQueuedCompletionStatus(completion_port, &len, &key, (OVERLAPPED **)&slot, INFINITE); - if (srv_recovery_stats && recv_recovery_is_on() && n_consecutive) { - mutex_enter(&(recv_sys->mutex)); - if (slot->type == OS_FILE_READ) { - recv_sys->stats_read_io_pages += n_consecutive; - recv_sys->stats_read_io_consecutive[n_consecutive - 1]++; - } else if (slot->type == OS_FILE_WRITE) { - recv_sys->stats_write_io_pages += n_consecutive; - recv_sys->stats_write_io_consecutive[n_consecutive - 1]++; - } - mutex_exit(&(recv_sys->mutex)); - } - /* If shutdown key was received, repost the shutdown message and exit */ if (ret && (key == IOCP_SHUTDOWN_KEY)) { PostQueuedCompletionStatus(completion_port, 0, key, NULL); diff --git a/storage/xtradb/srv/srv0srv.c b/storage/xtradb/srv/srv0srv.c index d82e1cda416..1b38c9cef7e 100644 --- a/storage/xtradb/srv/srv0srv.c +++ b/storage/xtradb/srv/srv0srv.c @@ -136,20 +136,6 @@ UNIV_INTERN ulint srv_max_file_format_at_startup = DICT_TF_FORMAT_MAX; /** Place locks to records only i.e. do not use next-key locking except on duplicate key checking and foreign key checking */ UNIV_INTERN ibool srv_locks_unsafe_for_binlog = FALSE; -#ifdef __WIN__ -/* Windows native condition variables. We use runtime loading / function -pointers, because they are not available on Windows Server 2003 and -Windows XP/2000. - -We use condition for events on Windows if possible, even if os_event -resembles Windows kernel event object well API-wise. The reason is -performance, kernel objects are heavyweights and WaitForSingleObject() is a -performance killer causing calling thread to context switch. Besides, Innodb -is preallocating large number (often millions) of os_events. With kernel event -objects it takes a big chunk out of non-paged pool, which is better suited -for tasks like IO than for storing idle event objects. */ -UNIV_INTERN ibool srv_use_native_conditions = FALSE; -#endif /* __WIN__ */ /* If this flag is TRUE, then we will use the native aio of the OS (provided we compiled Innobase with it in), otherwise we will diff --git a/storage/xtradb/srv/srv0start.c b/storage/xtradb/srv/srv0start.c index 4df3b158019..13a54f5bf03 100644 --- a/storage/xtradb/srv/srv0start.c +++ b/storage/xtradb/srv/srv0start.c @@ -1377,7 +1377,7 @@ innobase_start_or_create_for_mysql(void) } else if (0 == ut_strcmp(srv_file_flush_method_str, "async_unbuffered")) { srv_win_file_flush_method = SRV_WIN_IO_UNBUFFERED; - os_aio_use_native_aio = TRUE; + srv_use_native_aio = TRUE; #endif } else { ut_print_timestamp(stderr); diff --git a/unittest/mytap/CMakeLists.txt b/unittest/mytap/CMakeLists.txt index 40f23950369..063c69eb925 100644 --- a/unittest/mytap/CMakeLists.txt +++ b/unittest/mytap/CMakeLists.txt @@ -15,5 +15,3 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) ADD_LIBRARY(mytap tap.c) - -MY_ADD_TESTS(t/basic) |