Skip to content

M
mariadb
Commit 4533dcb6 authored by calvin's avatar calvin
Browse files
Options

branches/zip: adjust Windows loading method for 5.1.38 

Starting at 5.1.38, MySQL server exports symbols needed
for dynamic plugin on Windows. There is no need for
Windows specific loading. Also, the CMake files are
simplified in 5.1.38.

When WITH_INNOBASE_STORAGE_ENGINE is specified during
configuration (win\configure.js), InnoDB is built as
a static library. Otherwise, a dynamic InnoDB will be
built (ha_innodb.dll).

CMakeLists.txt requires minor changes in order to work
with MySQL prior to 5.1.38. The changes will be in a
separate patch.

This patch addresses Mantis issue#286.
parent 333eff74
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 1466 deletions
CMakeLists.txt
View file @ 4533dcb6
......@@ -15,41 +15,14 @@
# This is the CMakeLists for InnoDB Plugin
# The dynamic plugin requires CMake 2.6.0 or later. Otherwise, the /DELAYLOAD
# property will not be set
CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR)
# When PROJECT is defined, a separate .sln file will be generated.
# PROJECT (INNODB_PLUGIN)
MESSAGE(STATUS "Enter InnoDB ...")
MESSAGE(STATUS "INNODB_DYNAMIC_PLUGIN: " ${INNODB_DYNAMIC_PLUGIN})
# Print out CMake info
MESSAGE(STATUS "CMAKE_GENERATOR: " ${CMAKE_GENERATOR})
MESSAGE(STATUS "CMAKE_SOURCE_DIR: " ${CMAKE_SOURCE_DIR})
# Print out system information
MESSAGE(STATUS "CMAKE_SYSTEM: " ${CMAKE_SYSTEM})
MESSAGE(STATUS "CMAKE_SYSTEM_PROCESSOR: " ${CMAKE_SYSTEM_PROCESSOR})
MESSAGE(STATUS "UNIX: " ${UNIX})
MESSAGE(STATUS "WIN32: " ${WIN32})
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DSAFEMALLOC -DSAFE_MUTEX")
INCLUDE("${PROJECT_SOURCE_DIR}/storage/mysql_storage_engine.cmake")
IF (CMAKE_SIZEOF_VOID_P MATCHES 8)
SET(WIN64 TRUE)
ENDIF (CMAKE_SIZEOF_VOID_P MATCHES 8)
MESSAGE(STATUS "WIN64: " ${WIN64})
MESSAGE(STATUS "MSVC: " ${MSVC})
# Check type sizes
include(CheckTypeSize)
# Currently, the checked results are not used.
CHECK_TYPE_SIZE(int SIZEOF_INT)
CHECK_TYPE_SIZE(long SIZEOF_LONG)
CHECK_TYPE_SIZE(void* SIZEOF_VOID_P)
# Include directories under innobase
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/storage/innobase/include
${CMAKE_SOURCE_DIR}/storage/innobase/handler)
......@@ -63,12 +36,12 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
# Removing compiler optimizations for innodb/mem/* files on 64-bit Windows
# due to 64-bit compiler error, See MySQL Bug #19424, #36366, #34297
IF(MSVC AND $(WIN64))
IF (MSVC AND $(WIN64))
SET_SOURCE_FILES_PROPERTIES(mem/mem0mem.c mem/mem0pool.c
PROPERTIES COMPILE_FLAGS -Od)
ENDIF(MSVC AND $(WIN64))
ENDIF (MSVC AND $(WIN64))
SET(INNODB_SOURCES btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea.c
SET(INNOBASE_SOURCES btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea.c
buf/buf0buddy.c buf/buf0buf.c buf/buf0flu.c buf/buf0lru.c buf/buf0rea.c
data/data0data.c data/data0type.c
dict/dict0boot.c dict/dict0crea.c dict/dict0dict.c dict/dict0load.c dict/dict0mem.c
......@@ -101,31 +74,11 @@ SET(INNODB_SOURCES btr/btr0btr.c btr/btr0cur.c btr/btr0pcur.c btr/btr0sea.c
usr/usr0sess.c
ut/ut0byte.c ut/ut0dbg.c ut/ut0mem.c ut/ut0rnd.c ut/ut0ut.c ut/ut0vec.c
ut/ut0list.c ut/ut0wqueue.c)
IF(NOT SOURCE_SUBLIBS)
# INNODB_RW_LOCKS_USE_ATOMICS may be defined only if HAVE_WINDOWS_ATOMICS is defined.
# Windows Interlocked functions require Windows 2000 or newer operating system
ADD_DEFINITIONS(-D_WIN32 -DHAVE_WINDOWS_ATOMICS -DINNODB_RW_LOCKS_USE_ATOMICS -DIB_HAVE_PAUSE_INSTRUCTION)
ADD_LIBRARY(innobase STATIC ${INNODB_SOURCES})
# Require mysqld_error.h, which is built as part of the GenError
ADD_DEPENDENCIES(innobase GenError)
# only set MYSQL_SERVER for the builtin engine, not the plugin
SET_TARGET_PROPERTIES(innobase PROPERTIES COMPILE_FLAGS "-DMYSQL_SERVER")
# Dynamic plugin ha_innodb.dll
IF(INNODB_DYNAMIC_PLUGIN)
ADD_LIBRARY(ha_innodb SHARED ${INNODB_SOURCES} ha_innodb.def handler/win_delay_loader.cc)
# Require mysqld_error.h, which is built as part of the GenError
# Also require mysqld.lib, which is built as part of the mysqld
ADD_DEPENDENCIES(ha_innodb GenError mysqld)
TARGET_LINK_LIBRARIES(ha_innodb ${CMAKE_SOURCE_DIR}/sql/\$\(OutDir\)/mysqld.lib)
SET_TARGET_PROPERTIES(ha_innodb PROPERTIES OUTPUT_NAME ha_innodb)
SET_TARGET_PROPERTIES(ha_innodb PROPERTIES LINK_FLAGS "/MAP /MAPINFO:EXPORTS")
SET_TARGET_PROPERTIES(ha_innodb PROPERTIES LINK_FLAGS "/ENTRY:\"_DllMainCRTStartup@12\"")
SET_TARGET_PROPERTIES(ha_innodb PROPERTIES COMPILE_FLAGS "-DMYSQL_DYNAMIC_PLUGIN")
SET_TARGET_PROPERTIES(ha_innodb PROPERTIES LINK_FLAGS "/DELAYLOAD:mysqld.exe")
ENDIF(INNODB_DYNAMIC_PLUGIN)
ENDIF(NOT SOURCE_SUBLIBS)
MESSAGE(STATUS "Exit InnoDB ...")
ADD_DEFINITIONS(-DHAVE_WINDOWS_ATOMICS -DIB_HAVE_PAUSE_INSTRUCTION)
IF (WITH_INNOBASE_STORAGE_ENGINE)
MYSQL_STORAGE_ENGINE(INNOBASE)
ELSE (WITH_INNOBASE_STORAGE_ENGINE)
SET (INNODB_SOURCES ${INNOBASE_SOURCES})
MYSQL_STORAGE_ENGINE(INNODB)
ENDIF (WITH_INNOBASE_STORAGE_ENGINE)
\ No newline at end of file
handler/ha_innodb.cc
View file @ 4533dcb6
......@@ -105,12 +105,11 @@ extern "C" {
#include "ha_innodb.h"
#include "i_s.h"
#include "handler0vars.h"
#ifndef MYSQL_SERVER
/* This is needed because of Bug #3596. Let us hope that pthread_mutex_t
is defined the same in both builds: the MySQL server and the InnoDB plugin. */
extern pthread_mutex_t LOCK_thread_count;
extern MYSQL_PLUGIN_IMPORT pthread_mutex_t LOCK_thread_count;
#if MYSQL_VERSION_ID < 50124
/* this is defined in mysql_priv.h inside #ifdef MYSQL_SERVER
......@@ -133,13 +132,9 @@ static bool innodb_inited = 0;
/* In the Windows plugin, the return value of current_thd is
undefined. Map it to NULL. */
#if defined MYSQL_DYNAMIC_PLUGIN && defined __WIN__
# undef current_thd
# define current_thd NULL
# define EQ_CURRENT_THD(thd) TRUE
#else /* MYSQL_DYNAMIC_PLUGIN && __WIN__ */
# define EQ_CURRENT_THD(thd) ((thd) == current_thd)
#endif /* MYSQL_DYNAMIC_PLUGIN && __WIN__ */
#define EQ_CURRENT_THD(thd) ((thd) == current_thd)
static struct handlerton* innodb_hton_ptr;
......@@ -1063,6 +1058,7 @@ innobase_get_charset(
}
#if defined (__WIN__) && defined (MYSQL_DYNAMIC_PLUGIN)
extern MYSQL_PLUGIN_IMPORT MY_TMPDIR mysql_tmpdir_list;
/*******************************************************************//**
Map an OS error to an errno value. The OS error number is stored in
_doserrno and the mapped value is stored in errno) */
......
handler/handler0alter.cc
View file @ 4533dcb6
......@@ -35,7 +35,6 @@ extern "C" {
}
#include "ha_innodb.h"
#include "handler0vars.h"
/*************************************************************//**
Copies an InnoDB column to a MySQL field. This function is
......
handler/handler0vars.h deleted 100644 → 0
View file @ 333eff74
/*****************************************************************************
Copyright (c) 2008, 2009, Innobase Oy. All Rights Reserved.
This program is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free Software
Foundation; version 2 of the License.
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License along with
this program; if not, write to the Free Software Foundation, Inc., 59 Temple
Place, Suite 330, Boston, MA 02111-1307 USA
*****************************************************************************/
/*******************************************************************//**
@file handler/handler0vars.h
This file contains accessor functions for dynamic plugin on Windows.
***********************************************************************/
#if defined __WIN__ && defined MYSQL_DYNAMIC_PLUGIN
/*******************************************************************//**
This is a list of externals that can not be resolved by delay loading.
They have to be resolved indirectly via their addresses in the .map file.
All of them are external variables. */
extern CHARSET_INFO* wdl_my_charset_bin;
extern CHARSET_INFO* wdl_my_charset_latin1;
extern CHARSET_INFO* wdl_my_charset_filename;
extern CHARSET_INFO** wdl_system_charset_info;
extern CHARSET_INFO** wdl_default_charset_info;
extern CHARSET_INFO** wdl_all_charsets;
extern system_variables* wdl_global_system_variables;
extern char* wdl_mysql_real_data_home;
extern char** wdl_mysql_data_home;
extern char** wdl_tx_isolation_names;
extern char** wdl_binlog_format_names;
extern char* wdl_reg_ext;
extern pthread_mutex_t* wdl_LOCK_thread_count;
extern key_map* wdl_key_map_full;
extern MY_TMPDIR* wdl_mysql_tmpdir_list;
extern bool* wdl_mysqld_embedded;
extern uint* wdl_lower_case_table_names;
extern ulong* wdl_specialflag;
extern int* wdl_my_umask;
#define my_charset_bin (*wdl_my_charset_bin)
#define my_charset_latin1 (*wdl_my_charset_latin1)
#define my_charset_filename (*wdl_my_charset_filename)
#define system_charset_info (*wdl_system_charset_info)
#define default_charset_info (*wdl_default_charset_info)
#define all_charsets (wdl_all_charsets)
#define global_system_variables (*wdl_global_system_variables)
#define mysql_real_data_home (wdl_mysql_real_data_home)
#define mysql_data_home (*wdl_mysql_data_home)
#define tx_isolation_names (wdl_tx_isolation_names)
#define binlog_format_names (wdl_binlog_format_names)
#define reg_ext (wdl_reg_ext)
#define LOCK_thread_count (*wdl_LOCK_thread_count)
#define key_map_full (*wdl_key_map_full)
#define mysql_tmpdir_list (*wdl_mysql_tmpdir_list)
#define mysqld_embedded (*wdl_mysqld_embedded)
#define lower_case_table_names (*wdl_lower_case_table_names)
#define specialflag (*wdl_specialflag)
#define my_umask (*wdl_my_umask)
#endif
handler/i_s.cc
View file @ 4533dcb6
......@@ -42,7 +42,6 @@ extern "C" {
#include "ha_prototypes.h" /* for innobase_convert_name() */
#include "srv0start.h" /* for srv_was_started */
}
#include "handler0vars.h"
static const char plugin_author[] = "Innobase Oy";
......
handler/win_delay_loader.cc deleted 100644 → 0
View file @ 333eff74
This diff is collapsed.
win-plugin/README deleted 100644 → 0
View file @ 333eff74
This directory contains patches that need to be applied to the MySQL
source tree in order to build the dynamic plugin on Windows --
HA_INNODB.DLL. Please note the followings when adding the patches:
* The patch must be applied from the mysql top-level source directory.
patch -p0 < win-plugin.diff
* The patch filenames end in ".diff".
* All patches here are expected to apply cleanly to the latest MySQL 5.1
tree when storage/innobase is replaced with this InnoDB branch.
When applying the patch, the following files will be modified:
* CMakeLists.txt
* sql/CMakeLists.txt
* win/configure.js
Also, two new files will be added:
* sql/mysqld.def
* sql/mysqld_x64.def
You can get "patch" utility for Windows from http://unxutils.sourceforge.net/
win-plugin/win-plugin.diff deleted 100644 → 0
View file @ 333eff74
diff -Nur CMakeLists.txt.orig CMakeLists.txt
--- CMakeLists.txt.orig 2008-10-03 12:25:41 -05:00
+++ CMakeLists.txt 2008-09-26 17:32:51 -05:00
@@ -254,9 +254,9 @@
IF(WITH_FEDERATED_STORAGE_ENGINE)
ADD_SUBDIRECTORY(storage/federated)
ENDIF(WITH_FEDERATED_STORAGE_ENGINE)
-IF(WITH_INNOBASE_STORAGE_ENGINE)
+IF(WITH_INNOBASE_STORAGE_ENGINE OR INNODB_DYNAMIC_PLUGIN)
ADD_SUBDIRECTORY(storage/innobase)
-ENDIF(WITH_INNOBASE_STORAGE_ENGINE)
+ENDIF(WITH_INNOBASE_STORAGE_ENGINE OR INNODB_DYNAMIC_PLUGIN)
ADD_SUBDIRECTORY(sql)
ADD_SUBDIRECTORY(server-tools/instance-manager)
ADD_SUBDIRECTORY(libmysql)
diff -Nur sql/CMakeLists.txt.orig sql/CMakeLists.txt
--- sql/CMakeLists.txt.orig 2008-10-03 12:25:41 -05:00
+++ sql/CMakeLists.txt 2008-09-24 03:58:19 -05:00
@@ -98,6 +98,15 @@
LINK_FLAGS "/PDB:${CMAKE_CFG_INTDIR}/mysqld${MYSQLD_EXE_SUFFIX}.pdb")
ENDIF(cmake_version EQUAL 20406)
+# Checks for 64-bit version
+IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
+SET_TARGET_PROPERTIES(mysqld PROPERTIES
+ LINK_FLAGS "/def:\"${PROJECT_SOURCE_DIR}/sql/mysqld_x64.def\"")
+ELSE(CMAKE_SIZEOF_VOID_P MATCHES 8)
+SET_TARGET_PROPERTIES(mysqld PROPERTIES
+ LINK_FLAGS "/def:\"${PROJECT_SOURCE_DIR}/sql/mysqld.def\"")
+ENDIF(CMAKE_SIZEOF_VOID_P MATCHES 8)
+
IF(EMBED_MANIFESTS)
MYSQL_EMBED_MANIFEST("mysqld" "asInvoker")
ENDIF(EMBED_MANIFESTS)
diff -Nur sql/mysqld.def.orig sql/mysqld.def
--- sql/mysqld.def.orig 1969-12-31 18:00:00 -06:00
+++ sql/mysqld.def 2009-04-09 02:20:32 -05:00
@@ -0,0 +1,111 @@
+EXPORTS
+ ?use_hidden_primary_key@handler@@UAEXXZ
+ ?get_dynamic_partition_info@handler@@UAEXPAUPARTITION_INFO@@I@Z
+ ?read_first_row@handler@@UAEHPAEI@Z
+ ?read_range_next@handler@@UAEHXZ
+ ?read_range_first@handler@@UAEHPBUst_key_range@@0_N1@Z
+ ?read_multi_range_first@handler@@UAEHPAPAUst_key_multi_range@@PAU2@I_NPAUst_handler_buffer@@@Z
+ ?read_multi_range_next@handler@@UAEHPAPAUst_key_multi_range@@@Z
+ ?index_read_idx_map@handler@@UAEHPAEIPBEKW4ha_rkey_function@@@Z
+ ?print_error@handler@@UAEXHH@Z
+ ?clone@handler@@UAEPAV1@PAUst_mem_root@@@Z
+ ?get_auto_increment@handler@@UAEX_K00PA_K1@Z
+ ?index_next_same@handler@@UAEHPAEPBEI@Z
+ ?get_error_message@handler@@UAE_NHPAVString@@@Z
+ ?ha_thd@handler@@IBEPAVTHD@@XZ
+ ?update_auto_increment@handler@@QAEHXZ
+ ?ha_statistic_increment@handler@@IBEXPQsystem_status_var@@K@Z
+ ?trans_register_ha@@YAXPAVTHD@@_NPAUhandlerton@@@Z
+ ?cmp@Field_blob@@QAEHPBEI0I@Z
+ ?set_time@Field_timestamp@@QAEXXZ
+ ?sql_print_error@@YAXPBDZZ
+ ?sql_print_warning@@YAXPBDZZ
+ ?check_global_access@@YA_NPAVTHD@@K@Z
+ ?schema_table_store_record@@YA_NPAVTHD@@PAUst_table@@@Z
+ ?get_quote_char_for_identifier@@YAHPAVTHD@@PBDI@Z
+ ?copy@String@@QAE_NXZ
+ ?copy@String@@QAE_NABV1@@Z
+ ?copy@String@@QAE_NPBDIPAUcharset_info_st@@@Z
+ ?copy_and_convert@@YAIPADIPAUcharset_info_st@@PBDI1PAI@Z
+ ?filename_to_tablename@@YAIPBDPADI@Z
+ ?strconvert@@YAIPAUcharset_info_st@@PBD0PADIPAI@Z
+ ?calculate_key_len@@YAIPAUst_table@@IPBEK@Z
+ ?sql_alloc@@YAPAXI@Z
+ ?localtime_to_TIME@@YAXPAUst_mysql_time@@PAUtm@@@Z
+ ?push_warning@@YAPAVMYSQL_ERROR@@PAVTHD@@W4enum_warning_level@1@IPBD@Z
+ ?push_warning_printf@@YAXPAVTHD@@W4enum_warning_level@MYSQL_ERROR@@IPBDZZ
+ ?drop_table@handler@@EAEXPBD@Z
+ ?column_bitmaps_signal@handler@@UAEXXZ
+ ?delete_table@handler@@MAEHPBD@Z
+ ?rename_table@handler@@MAEHPBD0@Z
+ ?key_map_empty@@3V?$Bitmap@$0EA@@@B
+ ?THR_THD@@3PAVTHD@@A
+ ?end_of_list@@3Ulist_node@@A
+ ?mysql_tmpdir_list@@3Ust_my_tmpdir@@A
+ mysql_query_cache_invalidate4
+ thd_query
+ thd_sql_command
+ thd_get_thread_id
+ thd_get_xid
+ thd_slave_thread
+ thd_non_transactional_update
+ thd_mark_transaction_to_rollback
+ thd_security_context
+ thd_charset
+ thd_test_options
+ thd_ha_data
+ thd_killed
+ thd_tx_isolation
+ thd_tablespace_op
+ thd_sql_command
+ thd_memdup
+ thd_make_lex_string
+ thd_in_lock_tables
+ thd_binlog_format
+ _my_hash_init
+ my_hash_free
+ my_tmpdir
+ check_if_legal_filename
+ my_filename
+ my_sync_dir_by_file
+ alloc_root
+ thr_lock_data_init
+ thr_lock_init
+ thr_lock_delete
+ my_multi_malloc
+ get_charset
+ unpack_filename
+ my_hash_insert
+ my_hash_search
+ my_hash_delete
+ mysql_bin_log_file_pos
+ mysql_bin_log_file_name
+ mysqld_embedded
+ my_thread_name
+ my_malloc
+ my_no_flags_free
+ _sanity
+ _mymalloc
+ _myfree
+ _my_strdup
+ _my_thread_var
+ my_error
+ pthread_cond_init
+ pthread_cond_signal
+ pthread_cond_wait
+ pthread_cond_destroy
+ localtime_r
+ my_strdup
+ deflate
+ deflateEnd
+ deflateReset
+ deflateInit2_
+ inflateEnd
+ inflateInit_
+ inflate
+ compressBound
+ inflateInit2_
+ adler32
+ longlong2str
+ strend
+ my_snprintf
diff -Nur sql/mysqld_x64.def.orig sql/mysqld_x64.def
--- sql/mysqld_x64.def.orig 1969-12-31 18:00:00 -06:00
+++ sql/mysqld_x64.def 2009-04-09 02:22:04 -05:00
@@ -0,0 +1,111 @@
+EXPORTS
+ ?use_hidden_primary_key@handler@@UEAAXXZ
+ ?get_dynamic_partition_info@handler@@UEAAXPEAUPARTITION_INFO@@I@Z
+ ?read_first_row@handler@@UEAAHPEAEI@Z
+ ?read_range_next@handler@@UEAAHXZ
+ ?read_range_first@handler@@UEAAHPEBUst_key_range@@0_N1@Z
+ ?read_multi_range_first@handler@@UEAAHPEAPEAUst_key_multi_range@@PEAU2@I_NPEAUst_handler_buffer@@@Z
+ ?read_multi_range_next@handler@@UEAAHPEAPEAUst_key_multi_range@@@Z
+ ?index_read_idx_map@handler@@UEAAHPEAEIPEBEKW4ha_rkey_function@@@Z
+ ?print_error@handler@@UEAAXHH@Z
+ ?clone@handler@@UEAAPEAV1@PEAUst_mem_root@@@Z
+ ?get_auto_increment@handler@@UEAAX_K00PEA_K1@Z
+ ?index_next_same@handler@@UEAAHPEAEPEBEI@Z
+ ?get_error_message@handler@@UEAA_NHPEAVString@@@Z
+ ?ha_thd@handler@@IEBAPEAVTHD@@XZ
+ ?update_auto_increment@handler@@QEAAHXZ
+ ?ha_statistic_increment@handler@@IEBAXPEQsystem_status_var@@K@Z
+ ?trans_register_ha@@YAXPEAVTHD@@_NPEAUhandlerton@@@Z
+ ?cmp@Field_blob@@QEAAHPEBEI0I@Z
+ ?set_time@Field_timestamp@@QEAAXXZ
+ ?sql_print_error@@YAXPEBDZZ
+ ?sql_print_warning@@YAXPEBDZZ
+ ?check_global_access@@YA_NPEAVTHD@@K@Z
+ ?schema_table_store_record@@YA_NPEAVTHD@@PEAUst_table@@@Z
+ ?get_quote_char_for_identifier@@YAHPEAVTHD@@PEBDI@Z
+ ?copy@String@@QEAA_NXZ
+ ?copy@String@@QEAA_NAEBV1@@Z
+ ?copy@String@@QEAA_NPEBDIPEAUcharset_info_st@@@Z
+ ?copy_and_convert@@YAIPEADIPEAUcharset_info_st@@PEBDI1PEAI@Z
+ ?filename_to_tablename@@YAIPEBDPEADI@Z
+ ?strconvert@@YAIPEAUcharset_info_st@@PEBD0PEADIPEAI@Z
+ ?calculate_key_len@@YAIPEAUst_table@@IPEBEK@Z
+ ?sql_alloc@@YAPEAX_K@Z
+ ?localtime_to_TIME@@YAXPEAUst_mysql_time@@PEAUtm@@@Z
+ ?push_warning@@YAPEAVMYSQL_ERROR@@PEAVTHD@@W4enum_warning_level@1@IPEBD@Z
+ ?push_warning_printf@@YAXPEAVTHD@@W4enum_warning_level@MYSQL_ERROR@@IPEBDZZ
+ ?drop_table@handler@@EEAAXPEBD@Z
+ ?column_bitmaps_signal@handler@@UEAAXXZ
+ ?delete_table@handler@@MEAAHPEBD@Z
+ ?rename_table@handler@@MEAAHPEBD0@Z
+ ?key_map_empty@@3V?$Bitmap@$0EA@@@B
+ ?THR_THD@@3PEAVTHD@@EA
+ ?end_of_list@@3Ulist_node@@A
+ ?mysql_tmpdir_list@@3Ust_my_tmpdir@@A
+ mysql_query_cache_invalidate4
+ thd_query
+ thd_sql_command
+ thd_get_thread_id
+ thd_get_xid
+ thd_slave_thread
+ thd_non_transactional_update
+ thd_mark_transaction_to_rollback
+ thd_security_context
+ thd_charset
+ thd_test_options
+ thd_ha_data
+ thd_killed
+ thd_tx_isolation
+ thd_tablespace_op
+ thd_sql_command
+ thd_memdup
+ thd_make_lex_string
+ thd_in_lock_tables
+ thd_binlog_format
+ _my_hash_init
+ my_hash_free
+ my_tmpdir
+ check_if_legal_filename
+ my_filename
+ my_sync_dir_by_file
+ alloc_root
+ thr_lock_data_init
+ thr_lock_init
+ thr_lock_delete
+ my_multi_malloc
+ get_charset
+ unpack_filename
+ my_hash_insert
+ my_hash_search
+ my_hash_delete
+ mysql_bin_log_file_pos
+ mysql_bin_log_file_name
+ mysqld_embedded
+ my_thread_name
+ my_malloc
+ my_no_flags_free
+ _sanity
+ _mymalloc
+ _myfree
+ _my_strdup
+ _my_thread_var
+ my_error
+ pthread_cond_init
+ pthread_cond_signal
+ pthread_cond_wait
+ pthread_cond_destroy
+ localtime_r
+ my_strdup
+ deflate
+ deflateEnd
+ deflateReset
+ deflateInit2_
+ inflateEnd
+ inflateInit_
+ inflate
+ compressBound
+ inflateInit2_
+ adler32
+ longlong2str
+ strend
+ my_snprintf
diff -Nur win/configure.js.orig win/configure.js
--- win/configure.js.orig 2008-09-26 21:18:37 -05:00
+++ win/configure.js 2008-10-01 11:21:27 -05:00
@@ -50,6 +50,7 @@
case "EMBED_MANIFESTS":
case "EXTRA_DEBUG":
case "WITH_EMBEDDED_SERVER":
+ case "INNODB_DYNAMIC_PLUGIN":
configfile.WriteLine("SET (" + args.Item(i) + " TRUE)");
break;
case "MYSQL_SERVER_SUFFIX":
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7