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
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
/*****************************************************************************
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/win_delay_loader.cc
This file contains functions that implement the delay loader on Windows.
This is a customized version of delay loader with limited functionalities.
It does not support:
* (manual) unloading
* multiple delay loaded DLLs
* multiple loading of the same DLL
This delay loader is used only by the InnoDB plugin. Other components (DLLs)
can still use the default delay loader, provided by MSVC.
Several acronyms used by Microsoft:
* IAT: import address table
* INT: import name table
* RVA: Relative Virtual Address
See http://msdn.microsoft.com/en-us/magazine/bb985992.aspx for details of
PE format.
***********************************************************************/
#if defined (__WIN__) && defined (MYSQL_DYNAMIC_PLUGIN)
# define WIN32_LEAN_AND_MEAN
# include <windows.h>
# include <delayimp.h>
# include <mysql_priv.h>
extern "C" {
# include "univ.i"
# include "hash0hash.h"
}
/*******************************************************************//**
This following contains 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. */
CHARSET_INFO* wdl_my_charset_bin;
CHARSET_INFO* wdl_my_charset_latin1;
CHARSET_INFO* wdl_my_charset_filename;
CHARSET_INFO** wdl_system_charset_info;
CHARSET_INFO** wdl_default_charset_info;
CHARSET_INFO** wdl_all_charsets;
system_variables* wdl_global_system_variables;
char* wdl_mysql_real_data_home;
char** wdl_mysql_data_home;
char** wdl_tx_isolation_names;
char** wdl_binlog_format_names;
char* wdl_reg_ext;
pthread_mutex_t* wdl_LOCK_thread_count;
key_map* wdl_key_map_full;
MY_TMPDIR* wdl_mysql_tmpdir_list;
bool* wdl_mysqld_embedded;
uint* wdl_lower_case_table_names;
ulong* wdl_specialflag;
int* wdl_my_umask;
/*******************************************************************//**
The preferred load-address defined in PE (portable executable format). */
#if defined(_M_IA64)
#pragma section(".base", long, read)
extern "C"
__declspec(allocate(".base"))
const IMAGE_DOS_HEADER __ImageBase;
#else
extern "C"
const IMAGE_DOS_HEADER __ImageBase;
#endif
/*******************************************************************//**
A template function for converting a relative address (RVA) to an
absolute address (VA). This is due to the pointers in the delay
descriptor (ImgDelayDescr in delayimp.h) have been changed from
VAs to RVAs to work on both 32- and 64-bit platforms.
@return absolute virtual address */
template <class X>
X PFromRva(
/*=======*/
RVA rva) /*!< in: relative virtual address */
{
return X(PBYTE(&__ImageBase) + rva);
}
/*******************************************************************//**
Convert to the old format for convenience. The structure as well as its
element names follow the definition of ImgDelayDescr in delayimp.h. */
struct InternalImgDelayDescr
{
DWORD grAttrs; /*!< attributes */
LPCSTR szName; /*!< pointer to dll name */
HMODULE* phmod; /*!< address of module handle */
PImgThunkData pIAT; /*!< address of the IAT */
PCImgThunkData pINT; /*!< address of the INT */
PCImgThunkData pBoundIAT; /*!< address of the optional bound IAT */
PCImgThunkData pUnloadIAT; /*!< address of optional copy of
original IAT */
DWORD dwTimeStamp; /*!< 0 if not bound,
otherwise date/time stamp of DLL
bound to (Old BIND) */
};
typedef struct map_hash_chain_struct map_hash_chain_t;
struct map_hash_chain_struct {
char* symbol; /*!< pointer to a symbol */
ulint value; /*!< address of the symbol */
map_hash_chain_t* next; /*!< pointer to the next cell
in the same folder. */
map_hash_chain_t* chain; /*!< a linear chain used for
cleanup. */
};
static HMODULE my_hmod = 0;
static struct hash_table_struct* m_htbl = NULL ;
static map_hash_chain_t* chain_header = NULL;
static ibool wdl_init = FALSE;
const ulint MAP_HASH_CELLS_NUM = 10000;
#ifndef DBUG_OFF
/*******************************************************************//**
In the dynamic plugin, it is required to call the following dbug functions
in the server:
_db_pargs_
_db_doprnt_
_db_enter_
_db_return_
_db_dump_
The plugin will get those function pointers during the initialization. */
typedef void (__cdecl* pfn_db_enter_)(
const char* _func_,
const char* _file_,
uint _line_,
const char** _sfunc_,
const char** _sfile_,
uint* _slevel_,
char***);
typedef void (__cdecl* pfn_db_return_)(
uint _line_,
const char** _sfunc_,
const char** _sfile_,
uint* _slevel_);
typedef void (__cdecl* pfn_db_pargs_)(
uint _line_,
const char* keyword);
typedef void (__cdecl* pfn_db_doprnt_)(
const char* format,
...);
typedef void (__cdecl* pfn_db_dump_)(
uint _line_,
const char* keyword,
const unsigned char* memory,
size_t length);
static pfn_db_enter_ wdl_db_enter_;
static pfn_db_return_ wdl_db_return_;
static pfn_db_pargs_ wdl_db_pargs_;
static pfn_db_doprnt_ wdl_db_doprnt_;
static pfn_db_dump_ wdl_db_dump_;
#endif /* !DBUG_OFF */
/*************************************************************//**
Creates a hash table with >= n array cells. The actual number of cells is
chosen to be a prime number slightly bigger than n.
This is the same function as hash_create in hash0hash.c, except the
memory allocation. This function is invoked before the engine is
initialized, and buffer pools are not ready yet.
@return own: created hash table */
static
hash_table_t*
wdl_hash_create(
/*============*/
ulint n) /*!< in: number of array cells */
{
hash_cell_t* array;
ulint prime;
hash_table_t* table;
prime = ut_find_prime(n);
table = (hash_table_t*) malloc(sizeof(hash_table_t));
if (table == NULL) {
return(NULL);
}
array = (hash_cell_t*) malloc(sizeof(hash_cell_t) * prime);
if (array == NULL) {
free(table);
return(NULL);
}
table->array = array;
table->n_cells = prime;
table->n_mutexes = 0;
table->mutexes = NULL;
table->heaps = NULL;
table->heap = NULL;
table->magic_n = HASH_TABLE_MAGIC_N;
/* Initialize the cell array */
hash_table_clear(table);
return(table);
}
/*************************************************************//**
Frees a hash table. */
static
void
wdl_hash_table_free(
/*================*/
hash_table_t* table) /*!< in, own: hash table */
{
ut_a(table != NULL);
ut_a(table->mutexes == NULL);
free(table->array);
free(table);
}
/*******************************************************************//**
Function for calculating the count of imports given the base of the IAT.
@return number of imports */
static
ulint
wdl_import_count(
/*=============*/
PCImgThunkData pitd_base) /*!< in: base of the IAT */
{
ulint ret = 0;
PCImgThunkData pitd = pitd_base;
while (pitd->u1.Function) {
pitd++;
ret++;
}
return(ret);
}
/*******************************************************************//**
Read Mapfile to a hashtable for faster access
@return TRUE if the mapfile is loaded successfully. */
static
ibool
wdl_load_mapfile(
/*=============*/
const char* filename) /*!< in: name of the mapfile. */
{
FILE* fp;
const size_t nSize = 256;
char tmp_buf[nSize];
char* func_name;
char* func_addr;
ulint load_addr = 0;
ibool valid_load_addr = FALSE;
#ifdef _WIN64
const char* tmp_string = " Preferred load address is %16llx";
#else
const char* tmp_string = " Preferred load address is %08x";
#endif
fp = fopen(filename, "r");
if (fp == NULL) {
return(FALSE);
}
/* Check whether to create the hashtable */
if (m_htbl == NULL) {
m_htbl = wdl_hash_create(MAP_HASH_CELLS_NUM);
if (m_htbl == NULL) {
fclose(fp);
return(FALSE);
}
}
/* Search start of symbol list and get the preferred load address */
while (fgets(tmp_buf, sizeof(tmp_buf), fp)) {
if (sscanf(tmp_buf, tmp_string, &load_addr) == 1) {
valid_load_addr = TRUE;
}
if (strstr(tmp_buf, "Rva+Base") != NULL) {
break;
}
}
if (valid_load_addr == FALSE) {
/* No "Preferred load address", the map file is wrong. */
fclose(fp);
return(FALSE);
}
/* Read symbol list */
while (fgets(tmp_buf, sizeof(tmp_buf), fp))
{
map_hash_chain_t* map_cell;
ulint map_fold;
if (*tmp_buf == 0) {
continue;
}
func_name = strtok(tmp_buf, " ");
func_name = strtok(NULL, " ");
func_addr = strtok(NULL, " ");
if (func_name && func_addr) {
ut_snprintf(tmp_buf, nSize, "0x%s", func_addr);
if (*func_name == '_') {
func_name++;
}
map_cell = (map_hash_chain_t*)
malloc(sizeof(map_hash_chain_t));
if (map_cell == NULL) {
return(FALSE);
}
/* Chain all cells together */
map_cell->chain = chain_header;
chain_header = map_cell;
map_cell->symbol = strdup(func_name);
map_cell->value = (ulint) _strtoui64(tmp_buf, NULL, 0)
- load_addr;
map_fold = ut_fold_string(map_cell->symbol);
HASH_INSERT(map_hash_chain_t,
next,
m_htbl,
map_fold,
map_cell);
}
}
fclose(fp);
return(TRUE);
}
/*************************************************************//**
Cleanup.during DLL unload */
static
void
wdl_cleanup(void)
/*=============*/
{
while (chain_header != NULL) {
map_hash_chain_t* tmp;
tmp = chain_header->chain;
free(chain_header->symbol);
free(chain_header);
chain_header = tmp;
}
if (m_htbl != NULL) {
wdl_hash_table_free(m_htbl);
}
}
/*******************************************************************//**
Load the mapfile mysqld.map.
@return the module handle */
static
HMODULE
wdl_get_mysqld_mapfile(void)
/*========================*/
{
char file_name[MAX_PATH];
char* ext;
ulint err;
if (my_hmod == 0) {
size_t nSize = MAX_PATH - strlen(".map") -1;
/* First find out the name of current executable */
my_hmod = GetModuleHandle(NULL);
if (my_hmod == 0) {
return(my_hmod);
}
err = GetModuleFileName(my_hmod, file_name, nSize);
if (err == 0) {
my_hmod = 0;
return(my_hmod);
}
ext = strrchr(file_name, '.');
if (ext != NULL) {
*ext = 0;
strcat(file_name, ".map");
err = wdl_load_mapfile(file_name);
if (err == 0) {
my_hmod = 0;
}
} else {
my_hmod = 0;
}
}
return(my_hmod);
}
/*******************************************************************//**
Retrieves the address of an exported function. It follows the convention
of GetProcAddress().
@return address of exported function. */
static
FARPROC
wdl_get_procaddr_from_map(
/*======================*/
HANDLE m_handle, /*!< in: module handle */
const char* import_proc) /*!< in: procedure name */
{
map_hash_chain_t* hash_chain;
ulint map_fold;
map_fold = ut_fold_string(import_proc);
HASH_SEARCH(
next,
m_htbl,
map_fold,
map_hash_chain_t*,
hash_chain,
,
(ut_strcmp(hash_chain->symbol, import_proc) == 0));
if (hash_chain == NULL) {
#ifdef _WIN64
/* On Win64, the leading '_' may not be taken out. In this
case, search again without the leading '_'. */
if (*import_proc == '_') {
import_proc++;
}
map_fold = ut_fold_string(import_proc);
HASH_SEARCH(
next,
m_htbl,
map_fold,
map_hash_chain_t*,
hash_chain,
,
(ut_strcmp(hash_chain->symbol, import_proc) == 0));
if (hash_chain == NULL) {
#endif
if (wdl_init == TRUE) {
sql_print_error(
"InnoDB: the procedure pointer of %s"
" is not found.",
import_proc);
}
return(0);
#ifdef _WIN64
}
#endif
}
return((FARPROC) ((ulint) m_handle + hash_chain->value));
}
/*******************************************************************//**
Retrieves the address of an exported variable.
Note: It does not follow the Windows call convention FARPROC.
@return address of exported variable. */
static
void*
wdl_get_varaddr_from_map(
/*=====================*/
HANDLE m_handle, /*!< in: module handle */
const char* import_variable) /*!< in: variable name */
{
map_hash_chain_t* hash_chain;
ulint map_fold;
map_fold = ut_fold_string(import_variable);
HASH_SEARCH(
next,
m_htbl,
map_fold,
map_hash_chain_t*,
hash_chain,
,
(ut_strcmp(hash_chain->symbol, import_variable) == 0));
if (hash_chain == NULL) {
#ifdef _WIN64
/* On Win64, the leading '_' may not be taken out. In this
case, search again without the leading '_'. */
if (*import_variable == '_') {
import_variable++;
}
map_fold = ut_fold_string(import_variable);
HASH_SEARCH(
next,
m_htbl,
map_fold,
map_hash_chain_t*,
hash_chain,
,
(ut_strcmp(hash_chain->symbol, import_variable) == 0));
if (hash_chain == NULL) {
#endif
if (wdl_init == TRUE) {
sql_print_error(
"InnoDB: the variable address of %s"
" is not found.",
import_variable);
}
return(0);
#ifdef _WIN64
}
#endif
}
return((void*) ((ulint) m_handle + hash_chain->value));
}
/*******************************************************************//**
Bind all unresolved external variables from the MySQL executable.
@return TRUE if successful */
static
bool
wdl_get_external_variables(void)
/*============================*/
{
HMODULE hmod = wdl_get_mysqld_mapfile();
if (hmod == 0) {
return(FALSE);
}
#define GET_SYM(sym, var, type) \
var = (type*) wdl_get_varaddr_from_map(hmod, sym); \
if (var == NULL) return(FALSE)
#ifdef _WIN64
#define GET_SYM2(sym1, sym2, var, type) \
var = (type*) wdl_get_varaddr_from_map(hmod, sym1); \
if (var == NULL) return(FALSE)
#else
#define GET_SYM2(sym1, sym2, var, type) \
var = (type*) wdl_get_varaddr_from_map(hmod, sym2); \
if (var == NULL) return(FALSE)
#endif // (_WIN64)
#define GET_C_SYM(sym, type) GET_SYM(#sym, wdl_##sym, type)
#define GET_PROC_ADDR(sym) \
wdl##sym = (pfn##sym) wdl_get_procaddr_from_map(hmod, #sym)
GET_C_SYM(my_charset_bin, CHARSET_INFO);
GET_C_SYM(my_charset_latin1, CHARSET_INFO);
GET_C_SYM(my_charset_filename, CHARSET_INFO);
GET_C_SYM(default_charset_info, CHARSET_INFO*);
GET_C_SYM(all_charsets, CHARSET_INFO*);
GET_C_SYM(my_umask, int);
GET_SYM("?global_system_variables@@3Usystem_variables@@A",
wdl_global_system_variables, struct system_variables);
GET_SYM("?mysql_real_data_home@@3PADA",
wdl_mysql_real_data_home, char);
GET_SYM("?reg_ext@@3PADA", wdl_reg_ext, char);
GET_SYM("?LOCK_thread_count@@3U_RTL_CRITICAL_SECTION@@A",
wdl_LOCK_thread_count, pthread_mutex_t);
GET_SYM("?key_map_full@@3V?$Bitmap@$0EA@@@A",
wdl_key_map_full, key_map);
GET_SYM("?mysql_tmpdir_list@@3Ust_my_tmpdir@@A",
wdl_mysql_tmpdir_list, MY_TMPDIR);
GET_SYM("?mysqld_embedded@@3_NA",
wdl_mysqld_embedded, bool);
GET_SYM("?lower_case_table_names@@3IA",
wdl_lower_case_table_names, uint);
GET_SYM("?specialflag@@3KA", wdl_specialflag, ulong);
GET_SYM2("?system_charset_info@@3PEAUcharset_info_st@@EA",
"?system_charset_info@@3PAUcharset_info_st@@A",
wdl_system_charset_info, CHARSET_INFO*);
GET_SYM2("?mysql_data_home@@3PEADEA",
"?mysql_data_home@@3PADA",
wdl_mysql_data_home, char*);
GET_SYM2("?tx_isolation_names@@3PAPEBDA",
"?tx_isolation_names@@3PAPBDA",
wdl_tx_isolation_names, char*);
GET_SYM2("?binlog_format_names@@3PAPEBDA",
"?binlog_format_names@@3PAPBDA",
wdl_binlog_format_names, char*);
#ifndef DBUG_OFF
GET_PROC_ADDR(_db_enter_);
GET_PROC_ADDR(_db_return_);
GET_PROC_ADDR(_db_pargs_);
GET_PROC_ADDR(_db_doprnt_);
GET_PROC_ADDR(_db_dump_);
/* If any of the dbug functions is not available, just make them
all invalid. This is the case when working with a non-debug
version of the server. */
if (wdl_db_enter_ == NULL || wdl_db_return_ == NULL
|| wdl_db_pargs_ == NULL || wdl_db_doprnt_ == NULL
|| wdl_db_dump_ == NULL) {
wdl_db_enter_ = NULL;
wdl_db_return_ = NULL;
wdl_db_pargs_ = NULL;
wdl_db_doprnt_ = NULL;
wdl_db_dump_ = NULL;
}
#endif /* !DBUG_OFF */
wdl_init = TRUE;
return(TRUE);
#undef GET_SYM
#undef GET_SYM2
#undef GET_C_SYM
#undef GET_PROC_ADDR
}
/*******************************************************************//**
The DLL Delayed Loading Helper Function for resolving externals.
The function may fail due to one of the three reasons:
* Invalid parameter, which happens if the attributes in pidd aren't
specified correctly.
* Failed to load the map file mysqld.map.
* Failed to find an external name in the map file mysqld.map.
Note: this function is called by run-time as well as __HrLoadAllImportsForDll.
So, it has to follow Windows call convention.
@return the address of the imported function */
extern "C"
FARPROC WINAPI
__delayLoadHelper2(
/*===============*/
PCImgDelayDescr pidd, /*!< in: a const pointer to a
ImgDelayDescr, see delayimp.h. */
FARPROC* iat_entry) /*!< in/out: A pointer to the slot in
the delay load import address table
to be updated with the address of the
imported function. */
{
ulint iIAT, iINT;
HMODULE hmod;
PCImgThunkData pitd;
FARPROC fun = NULL;
/* Set up data used for the hook procs */
InternalImgDelayDescr idd = {
pidd->grAttrs,
PFromRva<LPCSTR>(pidd->rvaDLLName),
PFromRva<HMODULE*>(pidd->rvaHmod),
PFromRva<PImgThunkData>(pidd->rvaIAT),
PFromRva<PCImgThunkData>(pidd->rvaINT),
PFromRva<PCImgThunkData>(pidd->rvaBoundIAT),
PFromRva<PCImgThunkData>(pidd->rvaUnloadIAT),
pidd->dwTimeStamp
};
DelayLoadInfo dli = {
sizeof(DelayLoadInfo),
pidd,
iat_entry,
idd.szName,
{0},
0,
0,
0
};
/* Check the Delay Load Attributes, log an error of invalid
parameter, which happens if the attributes in pidd are not
specified correctly. */
if ((idd.grAttrs & dlattrRva) == 0) {
sql_print_error("InnoDB: invalid parameter for delay loader.");
return(0);
}
hmod = *idd.phmod;
/* Calculate the index for the IAT entry in the import address table.
The INT entries are ordered the same as the IAT entries so the
calculation can be done on the IAT side. */
iIAT = (PCImgThunkData) iat_entry - idd.pIAT;
iINT = iIAT;
pitd = &(idd.pINT[iINT]);
dli.dlp.fImportByName = !IMAGE_SNAP_BY_ORDINAL(pitd->u1.Ordinal);
if (dli.dlp.fImportByName) {
dli.dlp.szProcName = (LPCSTR) (PFromRva<PIMAGE_IMPORT_BY_NAME>
((RVA) ((UINT_PTR) pitd->u1.AddressOfData))->Name);
} else {
dli.dlp.dwOrdinal = (ulint) IMAGE_ORDINAL(pitd->u1.Ordinal);
}
/* Now, load the mapfile, if it has not been done yet */
if (hmod == 0) {
hmod = wdl_get_mysqld_mapfile();
}
if (hmod == 0) {
/* LoadLibrary failed. */
PDelayLoadInfo rgpdli[1] = {&dli};
dli.dwLastError = ::GetLastError();
sql_print_error(
"InnoDB: failed to load mysqld.map with error %d.",
dli.dwLastError);
return(0);
}
/* Store the library handle. */
idd.phmod = &hmod;
/* Go for the procedure now. */
dli.hmodCur = hmod;
if (pidd->rvaBoundIAT && pidd->dwTimeStamp) {
/* Bound imports exist, check the timestamp from the target
image */
PIMAGE_NT_HEADERS pinh;
pinh = (PIMAGE_NT_HEADERS) ((byte*) hmod
+ ((PIMAGE_DOS_HEADER) hmod)->e_lfanew);
if (pinh->Signature == IMAGE_NT_SIGNATURE
&& pinh->FileHeader.TimeDateStamp == idd.dwTimeStamp
&& (DWORD) hmod == pinh->OptionalHeader.ImageBase) {
/* We have a decent address in the bound IAT. */
fun = (FARPROC) (UINT_PTR)
idd.pBoundIAT[iIAT].u1.Function;
if (fun) {
*iat_entry = fun;
return(fun);
}
}
}
fun = wdl_get_procaddr_from_map(hmod, dli.dlp.szProcName);
if (fun == 0) {
return(0);
}
*iat_entry = fun;
return(fun);
}
/*******************************************************************//**
Unload a DLL that was delay loaded. This function is called by run-time.
@return TRUE is returned if the DLL is found and the IAT matches the
original one. */
extern "C"
BOOL WINAPI
__FUnloadDelayLoadedDLL2(
/*=====================*/
LPCSTR module_name) /*!< in: DLL name */
{
return(TRUE);
}
/**************************************************************//**
Load all imports from a DLL that was specified with the /delayload linker
option.
Note: this function is called by run-time. So, it has to follow Windows call
convention.
@return S_OK if the DLL matches, otherwise ERROR_MOD_NOT_FOUND is returned. */
extern "C"
HRESULT WINAPI
__HrLoadAllImportsForDll(
/*=====================*/
LPCSTR module_name) /*!< in: DLL name */
{
PIMAGE_NT_HEADERS img;
PCImgDelayDescr pidd;
IMAGE_DATA_DIRECTORY* image_data;
LPCSTR current_module;
HRESULT ret = ERROR_MOD_NOT_FOUND;
HMODULE hmod = (HMODULE) &__ImageBase;
img = (PIMAGE_NT_HEADERS) ((byte*) hmod
+ ((PIMAGE_DOS_HEADER) hmod)->e_lfanew);
image_data =
&img->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_DELAY_IMPORT];
/* Scan the delay load IAT/INT for the DLL */
if (image_data->Size) {
pidd = PFromRva<PCImgDelayDescr>(image_data->VirtualAddress);
/* Check all of the listed DLLs we want to load. */
while (pidd->rvaDLLName) {
current_module = PFromRva<LPCSTR>(pidd->rvaDLLName);
if (stricmp(module_name, current_module) == 0) {
/* Found it, break out with pidd and
current_module set appropriately */
break;
}
/* To the next delay import descriptor */
pidd++;
}
if (pidd->rvaDLLName) {
/* Found a matching DLL, now process it. */
FARPROC* iat_entry;
size_t count;
iat_entry = PFromRva<FARPROC*>(pidd->rvaIAT);
count = wdl_import_count((PCImgThunkData) iat_entry);
/* now load all the imports from the DLL */
while (count > 0) {
/* No need to check the return value */
__delayLoadHelper2(pidd, iat_entry);
iat_entry++;
count--;
}
ret = S_OK;
}
}
return ret;
}
/**************************************************************//**
The main function of a DLL
@return TRUE if the call succeeds */
BOOL
WINAPI
DllMain(
/*====*/
HINSTANCE hinstDLL, /*!< in: handle to the DLL module */
DWORD fdwReason, /*!< Reason code that indicates why the
DLL entry-point function is being
called.*/
LPVOID lpvReserved) /*!< in: additional parameter based on
fdwReason */
{
BOOL success = TRUE;
switch (fdwReason) {
case DLL_PROCESS_ATTACH:
success = wdl_get_external_variables();
break;
case DLL_PROCESS_DETACH:
wdl_cleanup();
break;
}
return(success);
}
#ifndef DBUG_OFF
/**************************************************************//**
Process entry point to user function. It makes the call to _db_enter_
in mysqld.exe. The DBUG functions are defined in my_dbug.h. */
extern "C" UNIV_INTERN
void
_db_enter_(
const char* _func_, /*!< in: current function name */
const char* _file_, /*!< in: current file name */
uint _line_, /*!< in: current source line number */
const char** _sfunc_, /*!< out: previous _func_ */
const char** _sfile_, /*!< out: previous _file_ */
uint* _slevel_, /*!< out: previous nesting level */
char*** _sframep_) /*!< out: previous frame pointer */
{
if (wdl_db_enter_ != NULL) {
wdl_db_enter_(_func_, _file_, _line_, _sfunc_, _sfile_,
_slevel_, _sframep_);
}
}
/**************************************************************//**
Process exit from user function. It makes the call to _db_return_()
in the server. */
extern "C" UNIV_INTERN
void
_db_return_(
uint _line_, /*!< in: current source line number */
const char** _sfunc_, /*!< out: previous _func_ */
const char** _sfile_, /*!< out: previous _file_ */
uint* _slevel_) /*!< out: previous level */
{
if (wdl_db_return_ != NULL) {
wdl_db_return_(_line_, _sfunc_, _sfile_, _slevel_);
}
}
/**************************************************************//**
Log arguments for subsequent use. It makes the call to _db_pargs_()
in the server. */
extern "C" UNIV_INTERN
void
_db_pargs_(
uint _line_, /*!< in: current source line number */
const char* keyword) /*!< in: keyword for current macro */
{
if (wdl_db_pargs_ != NULL) {
wdl_db_pargs_(_line_, keyword);
}
}
/**************************************************************//**
Handle print of debug lines. It saves the text into a buffer first,
then makes the call to _db_doprnt_() in the server. The text is
truncated to the size of buffer. */
extern "C" UNIV_INTERN
void
_db_doprnt_(
const char* format, /*!< in: the format string */
...) /*!< in: list of arguments */
{
va_list argp;
char buffer[512];
if (wdl_db_doprnt_ != NULL) {
va_start(argp, format);
/* it is ok to ignore the trunction. */
_vsnprintf(buffer, sizeof(buffer), format, argp);
wdl_db_doprnt_(buffer);
va_end(argp);
}
}
/**************************************************************//**
Dump a string in hex. It makes the call to _db_dump_() in the server. */
extern "C" UNIV_INTERN
void
_db_dump_(
uint _line_, /*!< in: current source line
number */
const char* keyword, /*!< in: keyword list */
const unsigned char* memory, /*!< in: memory to dump */
size_t length) /*!< in: bytes to dump */
{
if (wdl_db_dump_ != NULL) {
wdl_db_dump_(_line_, keyword, memory, length);
}
}
#endif /* !DBUG_OFF */
#endif /* defined (__WIN__) && defined (MYSQL_DYNAMIC_PLUGIN) */
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