Browse Source
branches/innodb+: Merge revisions 2867:2986 from branches/zip:
branches/innodb+: Merge revisions 2867:2986 from branches/zip:
------------------------------------------------------------------------
r2867 | marko | 2008-10-24 10:24:17 +0300 (Fri, 24 Oct 2008) | 2 lines
branches/zip: ChangeLog: Document r2763, r2794, r2683, r2799, r2809, r2866.
------------------------------------------------------------------------
r2869 | vasil | 2008-10-24 11:14:16 +0300 (Fri, 24 Oct 2008) | 4 lines
branches/zip:
White space cleanup in ChangeLog
------------------------------------------------------------------------
r2870 | vasil | 2008-10-24 13:36:14 +0300 (Fri, 24 Oct 2008) | 8 lines
branches/zip:
Remove a statement that causes the innodb-index test to fail.
The change in behavior was introduced in MySQL BZR-r2738.
Suggested by: Marko
------------------------------------------------------------------------
r2871 | vasil | 2008-10-24 13:48:38 +0300 (Fri, 24 Oct 2008) | 5 lines
branches/zip:
Adjust mysql-test/patches/innodb-index.diff after the change to
mysql-test/innodb-index.(test|result) in r2870.
------------------------------------------------------------------------
r2878 | calvin | 2008-10-27 11:05:42 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: port the fix of Bug#19424 - InnoDB: Possibly a memory
overrun of the buffer being freed with 64-bit Microsoft Visual C++.
The changed file:
CMakeLists.txt: Removing Win64 compiler optimizations for all
innodb/mem/* files.
------------------------------------------------------------------------
r2884 | vasil | 2008-10-27 11:48:46 +0200 (Mon, 27 Oct 2008) | 7 lines
branches/zip:
ChangeLog:
Add entry for the fix of Bug#19424 InnoDB: Possibly a memory overrun of
the buffer being freed (64-bit Visual C)
------------------------------------------------------------------------
r2886 | calvin | 2008-10-27 22:39:11 +0200 (Mon, 27 Oct 2008) | 8 lines
branches/zip: This patch is to solve the issue that file handles can
not cross DLL/EXE boundaries on Windows. In builtin InnoDB, it makes
call to MySQL server for creating tmp files. innobase_mysql_tmpfile
is now rewritten for the plugin.
rb://5
Approved by: Marko
------------------------------------------------------------------------
r2887 | calvin | 2008-10-27 22:48:29 +0200 (Mon, 27 Oct 2008) | 44 lines
branches/zip: implement the delayloading of externals for the plugin
on Windows, which includes:
* Load mysqld.map and insert all symbol/address pairs into hash for
quick access
* Resolves all external data variables. The delayloading mechanism
in MSVC does not support automatic imports of data variables.
A workaround is to explicitly handle the data import using the delay
loader during the initialization of the plugin.
* Resolves all external functions during run-time, by implementing
the delayed loading helper function delayLoadHelper2, which is
called by run-time as well as HrLoadAllImportsForDll.
The delay loader reuses the hash implementation in InnoDB. The normal
hash_create (in hash0hash.c) creates hash tables in buffer pool. But
the delay loader is invoked before the engine is initialized, and
buffer pools are not ready yet. Instead, the delay loader has its own
implementation of hash_create() and hash_table_free(), called
wdl_hash_create() and wdl_hash_table_free().
This patch should be used with other two patches in order to build
a dynamically linked plugin on Windows:
* patch for tmpfile functions (r2886)
* patch for "build" files (to be committed)
The list of file changed:
handler/handler0vars.h: new file, defines a list of external data
variables (no external functions).
handler/win_delay_loader.cc: new file, the implementation of the delay
loader for Windows plugin.
handler/ha_innodb.cc: add a header file, and changes for copying the
system variables.
handler/handler0alter.cc: add a header file
handler/i_s.cc: add a header file
rb://27
Reviewed by: Sunny, Marko
Approved by: Sunny
------------------------------------------------------------------------
r2888 | calvin | 2008-10-28 01:51:49 +0200 (Tue, 28 Oct 2008) | 25 lines
branches/zip: for building dynamic plugin on Windows, ha_innodb.dll,
when INNODB_DYNAMIC_PLUGIN is specified.
The changes are:
CMakeLists.txt: add project ha_innodb for dynamic plugin on Windows.
ha_innodb depends on project mysqld.
ha_innodb.def: a new file with standard exports for a dynamic plugin.
Two new files will be added:
* sql/mysqld.def: .def file for 32-bit compiler
* sql/mysqld_x64.def: .def file for x64 compiler
It is also required to apply a patch to the MySQL source tree. The
patch is described in win-plugin/README:
win-plugin/win-plugin.diff - a patch to be applied to MySQL source
tree. When applied, the following files will be modified:
* CMakeLists.txt: add INNODB_DYNAMIC_PLUGIN and _USE_32BIT_TIME_T
* sql/CMakeLists.txt: add mysqld.def or mysqld_x64.def for mysqld
* win/configure.js: add INNODB_DYNAMIC_PLUGIN
* win/build-vs71.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8.bat: provide an option to specify CMAKE_BUILD_TYPE
* win/build-vs8_x64.bat: provide an option to specify CMAKE_BUILD_TYPE
------------------------------------------------------------------------
r2894 | marko | 2008-10-28 08:36:39 +0200 (Tue, 28 Oct 2008) | 4 lines
branches/zip: dict_str_starts_with_keyword(): Removed this unused function.
Spotted by Sunny.
------------------------------------------------------------------------
r2895 | vasil | 2008-10-28 08:40:45 +0200 (Tue, 28 Oct 2008) | 6 lines
branches/zip:
ChangeLog:
add entry for the Windows plugin.
------------------------------------------------------------------------
r2917 | marko | 2008-10-28 23:53:23 +0200 (Tue, 28 Oct 2008) | 3 lines
branches/zip: innodb_plugin_init(): Do not copy session variables,
even when the variable is a global variable in the built-in InnoDB.
------------------------------------------------------------------------
r2918 | calvin | 2008-10-29 00:08:11 +0200 (Wed, 29 Oct 2008) | 2 lines
branches/zip: fix a problem introduced in r2917 - dyn is not
initialized. Move the check into for().
------------------------------------------------------------------------
r2922 | calvin | 2008-10-29 08:29:01 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: fix issue #102 - Windows plugin: resolve dbug functions
during run-time.
Implement wrapper functions in the plugin. The plugin will get the
function entries from mysqld.exe during the init, and invoke the
corresponding functions (in mysqld.exe). The list of functions are:
_db_pargs_
_db_doprnt_
_db_enter_
_db_return_
_db_dump_
rb://38
Approved by: Marko
------------------------------------------------------------------------
r2923 | marko | 2008-10-29 09:52:30 +0200 (Wed, 29 Oct 2008) | 1 line
branches/zip: ChangeLog: Mention Bug #27276.
------------------------------------------------------------------------
r2925 | calvin | 2008-10-29 10:09:41 +0200 (Wed, 29 Oct 2008) | 16 lines
branches/zip: change function names in sql/mysqld.def in order
to work with 5.1.29-rc.
In 5.1.29, the following function names are changed:
_hash_init
hash_free
hash_search
hash_delete
changed to
_my_hash_init
my_hash_free
my_hash_search
my_hash_delete
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2927 | marko | 2008-10-29 11:43:23 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip: ha_innodb.cc: Make some functions static, so that they will
not be compiled as weak global symbols. These functions must not be
redirected to the built-in InnoDB.
------------------------------------------------------------------------
r2928 | michael | 2008-10-29 19:20:10 +0200 (Wed, 29 Oct 2008) | 4 lines
Remove unnecessary assert
Approved by: Heikki, over IM
------------------------------------------------------------------------
r2930 | marko | 2008-10-29 21:39:24 +0200 (Wed, 29 Oct 2008) | 33 lines
branches/zip: Merge revisions 2854:2929 from branches/5.1,
except r2924, which was merged from branches/zip r2866 to branches/5.1
and except r2879 which was merged separately by Calvin:
------------------------------------------------------------------------
r2902 | vasil | 2008-10-28 12:10:25 +0200 (Tue, 28 Oct 2008) | 10 lines
branches/5.1:
Fix Bug#38189 innodb_stats_on_metadata missing
Make the variable innodb_stats_on_metadata visible to the users and
also settable at runtime. Previously it was only "visible" as a command
line startup option to mysqld.
Approved by: Marko (https://svn.innodb.com/rb/r/36)
------------------------------------------------------------------------
r2929 | marko | 2008-10-29 21:26:14 +0200 (Wed, 29 Oct 2008) | 13 lines
branches/5.1: dtype_get_sql_null_size(): return the correct storage
size of a SQL NULL column. (Bug #40369)
When MySQL Bug #20877 was fixed in r834, this function was
accidentally modified to return 0 or 1. Apparently, the only impact of
this bug is that fixed-length columns cannot be updated in-place from
or to SQL NULL, even in ROW_FORMAT=REDUNDANT. After this fix,
fixed-length columns in ROW_FORMAT=REDUNDANT will have a constant
storage size as they should, no matter if NULL or non-NULL. The bug
caused fixed-length NULL columns to occupy 1 byte.
rb://37 approved by Heikki over IM.
------------------------------------------------------------------------
------------------------------------------------------------------------
r2931 | vasil | 2008-10-29 22:10:40 +0200 (Wed, 29 Oct 2008) | 4 lines
branches/zip:
Add 2 ChangeLog entries for the 2 bugfixes that were merged from branches/5.1.
------------------------------------------------------------------------
r2935 | vasil | 2008-10-30 12:17:23 +0200 (Thu, 30 Oct 2008) | 17 lines
branches/zip:
Fix "Bug#40360 Binlog related errors with binlog off" in InnoDB code in order
to have a Bug#40360-free InnoDB Plugin 1.0.2.
The fix does check whether binary logging is enabled in MySQL by accessing the
opt_bin_log global variable that is defined in sql/mysqld.cc.
In case MySQL does develop another solution to this via Bug#40360 then we can
revert this patch (except the mysql-tests).
The windows-plugin part of this fix will be committed as a separate commit to
ease eventual merge into branches/5.1 [note from the future: the separate
commit went into r2936].
Approved by: Marko (https://svn.innodb.com/rb/r/39)
------------------------------------------------------------------------
r2936 | vasil | 2008-10-30 12:24:09 +0200 (Thu, 30 Oct 2008) | 7 lines
branches/zip:
Followup to r2935: add the Windows Delay Loader stuff for the MySQL
variable that we are accessing. If someday we have another solution for
Bug#40360 Binlog related errors with binlog off
then this should also be reverted.
------------------------------------------------------------------------
r2937 | vasil | 2008-10-30 12:28:47 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Add ChangeLog entry for Bug#40360 Binlog related errors with binlog off
------------------------------------------------------------------------
r2938 | vasil | 2008-10-30 12:33:28 +0200 (Thu, 30 Oct 2008) | 5 lines
branches/zip:
Non-functional change: convert handler/handler0vars.h and
handler/win_delay_loader.cc from \r\n (dos) to \n (unix) line terminators.
------------------------------------------------------------------------
r2939 | marko | 2008-10-30 12:38:18 +0200 (Thu, 30 Oct 2008) | 2 lines
branches/zip: Set svn:eol-style native on some recently added text files.
------------------------------------------------------------------------
r2940 | marko | 2008-10-30 12:46:21 +0200 (Thu, 30 Oct 2008) | 1 line
branches/zip: ChangeLog, ha_innodb.def: Set svn:eol-style native
------------------------------------------------------------------------
r2941 | vasil | 2008-10-30 19:34:27 +0200 (Thu, 30 Oct 2008) | 4 lines
branches/zip:
Increment the InnoDB Plugin version from 1.0.1 to 1.0.2.
------------------------------------------------------------------------
r2943 | sunny | 2008-10-31 09:40:29 +0200 (Fri, 31 Oct 2008) | 15 lines
branches/zip:
1. We add a vector of locks to trx_t. This array contains the autoinc
locks granted to a transaction. There is one per table.
2. We enforce releasing of these locks in the reverse order from the
one in which they are acquired. The assumption is that since the
AUTOINC locks are statement level locks. Nested statements introduced
by triggers are stacked it should hold.
There was some cleanup done to the vector code too by adding const and
some new functions. Rename dict_table_t::auto_inc_lock to autoinc_lock.
Fix Bug#26316 Triggers create duplicate entries on auto-increment columns
rb://22
------------------------------------------------------------------------
r2944 | vasil | 2008-10-31 09:44:16 +0200 (Fri, 31 Oct 2008) | 12 lines
branches/zip:
Revert our temporary fix for "Bug#40360 Binlog related errors with binlog off"
(r2935, r2936) and deploy MySQL's one, but put the function
mysql_bin_log_is_engaged() inside mysql_addons.cc instead of in mysql's log.cc
and use a different name for it so there is no collision when MySQL adds this
function in log.cc.
[note from the future: the windows part of this patch went into r2947]
Approved by: Marko (https://svn.innodb.com/rb/r/41/)
------------------------------------------------------------------------
r2945 | sunny | 2008-10-31 09:44:45 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Update ChangeLog with r2943 info.
------------------------------------------------------------------------
r2946 | marko | 2008-10-31 10:18:47 +0200 (Fri, 31 Oct 2008) | 2 lines
branches/zip: Revert the unintended change to univ.i that was made in r2943.
------------------------------------------------------------------------
r2947 | calvin | 2008-10-31 10:38:26 +0200 (Fri, 31 Oct 2008) | 6 lines
branches/zip: Windows plugin part of r2944
r2944 has reference to mysql_bin_log.is_open(), which is new in InnoDB.
Add two new entries and remove one duplicate in mysqld.def &
mysqld_x64.def.
------------------------------------------------------------------------
r2948 | vasil | 2008-10-31 11:39:07 +0200 (Fri, 31 Oct 2008) | 9 lines
branches/zip:
Fix Mantis issue#106 plugin init error:InnoDB: stats_on_metadata in static
InnoDB (flags=0x2401) differs from stats_on_metadata in dynamic InnoDB (fl
Ignore the NOSYSVAR flag in addition to ignoring the READONLY flag.
Approved by: Marko (https://svn.innodb.com/rb/r/42/)
------------------------------------------------------------------------
r2949 | vasil | 2008-10-31 11:47:56 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip:
White-space cleanup in ChangeLog.
------------------------------------------------------------------------
r2951 | marko | 2008-10-31 14:21:43 +0200 (Fri, 31 Oct 2008) | 4 lines
branches/zip: scripts/install_innodb_plugins_win.sql: New script,
for installing the InnoDB plugins in Windows. Copied from
scripts/install_innodb_plugins.sql.
------------------------------------------------------------------------
r2954 | calvin | 2008-11-04 09:15:26 +0200 (Tue, 04 Nov 2008) | 8 lines
branches/zip: ignore the failure when builtin_innobase_plugin is not
available.
External variable builtin_innobase_plugin is not available when mysqld
does not have a builtin InnoDB. The init of the Windows plugin should
not fail in this case.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2955 | calvin | 2008-11-04 12:43:14 +0200 (Tue, 04 Nov 2008) | 11 lines
branches/zip: windows plugin - fix references to array variables.
This problem surfaced when running new test innodb_bug40360.test. Both
tx_isolation_names and binlog_format_names are name arrays, and
should be defined as wdl_tx_isolation_names and wdl_binlog_format_names,
not *wdl_tx_isolation_names and *wdl_binlog_format_names.
Another array variable is all_charsets, which is already correctly
defined.
Approved by: Marko (on IM)
------------------------------------------------------------------------
r2986 | marko | 2008-11-11 09:28:37 +0200 (Tue, 11 Nov 2008) | 11 lines
branches/zip: ha_innobase::create(): Remove the dependences on
DICT_TF_ZSSIZE_MAX, so that the code can be compiled with a different
uncompressed page size by redefining UNIV_PAGE_SIZE_SHIFT in univ.i.
Currently, the allowed values are 12, 13, or 14 (4k, 8k, 16k).
Make the default compressed page size half the uncompressed page size.
The previous default was 8 kilobytes, which is the same when compiling
with the default 16k uncompressed page size.
rb://50 approved by Pekka Lampio and Sunny Bains.
------------------------------------------------------------------------
pull/73/head
marko
17 years ago
35 changed files with 1989 additions and 242 deletions
-
32CMakeLists.txt
-
116ChangeLog
-
19dict/dict0dict.c
-
2dict/dict0mem.c
-
4ha_innodb.def
-
247handler/ha_innodb.cc
-
1handler/handler0alter.cc
-
51handler/handler0vars.h
-
1handler/i_s.cc
-
13handler/mysql_addons.cc
-
1012handler/win_delay_loader.cc
-
2include/data0type.ic
-
11include/dict0dict.h
-
34include/dict0mem.h
-
16include/lock0lock.h
-
13include/mysql_addons.h
-
4include/row0mysql.h
-
2include/srv0srv.h
-
10include/trx0trx.h
-
2include/univ.i
-
9include/ut0rnd.ic
-
28include/ut0vec.h
-
46include/ut0vec.ic
-
140lock/lock0lock.c
-
2mysql-test/innodb-index.result
-
2mysql-test/innodb-index.test
-
4mysql-test/innodb_bug40360.result
-
16mysql-test/innodb_bug40360.test
-
8mysql-test/patches/innodb-index.diff
-
27row/row0mysql.c
-
9scripts/install_innodb_plugins_win.sql
-
2srv/srv0srv.c
-
11trx/trx0trx.c
-
25win-plugin/README
-
310win-plugin/win-plugin.diff
@ -0,0 +1,4 @@ |
|||
EXPORTS |
|||
_mysql_plugin_interface_version_ |
|||
_mysql_sizeof_struct_st_plugin_ |
|||
_mysql_plugin_declarations_ |
|||
@ -0,0 +1,51 @@ |
|||
/*********************************************************************** |
|||
This file contains accessor functions for dynamic plugin on Windows. |
|||
|
|||
(c) 2008 Innobase Oy |
|||
***********************************************************************/ |
|||
#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 |
|||
1012
handler/win_delay_loader.cc
File diff suppressed because it is too large
View File
File diff suppressed because it is too large
View File
@ -0,0 +1,4 @@ |
|||
SET TX_ISOLATION='READ-COMMITTED'; |
|||
CREATE TABLE bug40360 (a INT) engine=innodb; |
|||
INSERT INTO bug40360 VALUES (1); |
|||
DROP TABLE bug40360; |
|||
@ -0,0 +1,16 @@ |
|||
# |
|||
# Make sure http://bugs.mysql.com/40360 remains fixed. |
|||
# |
|||
|
|||
-- source include/not_embedded.inc |
|||
-- source include/have_innodb.inc |
|||
|
|||
SET TX_ISOLATION='READ-COMMITTED'; |
|||
|
|||
# This is the default since MySQL 5.1.29 SET BINLOG_FORMAT='STATEMENT'; |
|||
|
|||
CREATE TABLE bug40360 (a INT) engine=innodb; |
|||
|
|||
INSERT INTO bug40360 VALUES (1); |
|||
|
|||
DROP TABLE bug40360; |
|||
@ -0,0 +1,9 @@ |
|||
-- execute these to install InnoDB if it is built as a dynamic plugin |
|||
INSTALL PLUGIN innodb SONAME 'ha_innodb.dll'; |
|||
INSTALL PLUGIN innodb_trx SONAME 'ha_innodb.dll'; |
|||
INSTALL PLUGIN innodb_locks SONAME 'ha_innodb.dll'; |
|||
INSTALL PLUGIN innodb_lock_waits SONAME 'ha_innodb.dll'; |
|||
INSTALL PLUGIN innodb_cmp SONAME 'ha_innodb.dll'; |
|||
INSTALL PLUGIN innodb_cmp_reset SONAME 'ha_innodb.dll'; |
|||
INSTALL PLUGIN innodb_cmpmem SONAME 'ha_innodb.dll'; |
|||
INSTALL PLUGIN innodb_cmpmem_reset SONAME 'ha_innodb.dll'; |
|||
@ -0,0 +1,25 @@ |
|||
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 |
|||
* win/build-vs71.bat |
|||
* win/build-vs8.bat |
|||
* win/build-vs8_x64.bat |
|||
|
|||
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/ |
|||
@ -0,0 +1,310 @@ |
|||
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
|
|||
@@ -97,6 +97,10 @@
|
|||
IF(CYBOZU) |
|||
ADD_DEFINITIONS(-DCYBOZU) |
|||
ENDIF(CYBOZU) |
|||
+# Checks for 32-bit version. And always use 32-bit time_t for compatibility
|
|||
+IF(CMAKE_GENERATOR MATCHES "Visual Studio" AND CMAKE_SIZEOF_VOID_P MATCHES 4)
|
|||
+ ADD_DEFINITIONS(-D_USE_32BIT_TIME_T)
|
|||
+ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio" AND CMAKE_SIZEOF_VOID_P MATCHES 4)
|
|||
|
|||
# in some places we use DBUG_OFF |
|||
SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DDBUG_OFF") |
|||
@@ -246,9 +250,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
|
|||
@@ -100,6 +100,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 2008-10-31 02:20:32 -05:00
|
|||
@@ -0,0 +1,99 @@
|
|||
+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_bin_log@@3VMYSQL_BIN_LOG@@A
|
|||
+ ?is_open@MYSQL_LOG@@QAE_NXZ
|
|||
+ mysql_query_cache_invalidate4
|
|||
+ thd_query
|
|||
+ thd_sql_command
|
|||
+ 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
|
|||
|
|||
diff -Nur ../old/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 2008-10-31 02:22:04 -05:00
|
|||
@@ -0,0 +1,99 @@
|
|||
+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_bin_log@@3VMYSQL_BIN_LOG@@A
|
|||
+ ?is_open@MYSQL_LOG@@QEAA_NXZ
|
|||
+ mysql_query_cache_invalidate4
|
|||
+ thd_query
|
|||
+ thd_sql_command
|
|||
+ 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
|
|||
|
|||
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
|
|||
@@ -49,6 +49,7 @@
|
|||
case "CYBOZU": |
|||
case "EMBED_MANIFESTS": |
|||
case "WITH_EMBEDDED_SERVER": |
|||
+ case "INNODB_DYNAMIC_PLUGIN":
|
|||
configfile.WriteLine("SET (" + args.Item(i) + " TRUE)"); |
|||
break; |
|||
case "MYSQL_SERVER_SUFFIX": |
|||
|
|||
diff -Nur win/build-vs71.bat.orig win/build-vs71.bat
|
|||
--- win/build-vs71.bat.orig 2008-08-20 10:21:59 -05:00
|
|||
+++ win/build-vs71.bat 2008-10-27 10:52:38 -05:00
|
|||
@@ -15,8 +15,10 @@
|
|||
REM along with this program; if not, write to the Free Software |
|||
REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
|||
|
|||
+REM CMAKE_BUILD_TYPE can be specified as Release or Debug
|
|||
+
|
|||
if exist cmakecache.txt del cmakecache.txt |
|||
copy win\vs71cache.txt cmakecache.txt |
|||
-cmake -G "Visual Studio 7 .NET 2003"
|
|||
+cmake -G "Visual Studio 7 .NET 2003" -DCMAKE_BUILD_TYPE=%1
|
|||
copy cmakecache.txt win\vs71cache.txt |
|||
|
|||
diff -Nur win/build-vs8.bat.orig win/build-vs8.bat
|
|||
--- win/build-vs8.bat.orig 2008-08-20 10:21:59 -05:00
|
|||
+++ win/build-vs8.bat 2008-10-27 10:52:31 -05:00
|
|||
@@ -15,7 +15,9 @@
|
|||
REM along with this program; if not, write to the Free Software |
|||
REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
|||
|
|||
+REM CMAKE_BUILD_TYPE can be specified as Release or Debug
|
|||
+
|
|||
if exist cmakecache.txt del cmakecache.txt |
|||
copy win\vs8cache.txt cmakecache.txt |
|||
-cmake -G "Visual Studio 8 2005"
|
|||
+cmake -G "Visual Studio 8 2005" -DCMAKE_BUILD_TYPE=%1
|
|||
copy cmakecache.txt win\vs8cache.txt |
|||
diff -Nur win/build-vs8_x64.bat.orig win/build-vs8_x64.bat
|
|||
--- win/build-vs8_x64.bat.orig 2008-08-20 10:21:59 -05:00
|
|||
+++ win/build-vs8_x64.bat 2008-10-27 10:53:11 -05:00
|
|||
@@ -15,7 +15,9 @@
|
|||
REM along with this program; if not, write to the Free Software |
|||
REM Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
|||
|
|||
+REM CMAKE_BUILD_TYPE can be specified as Release or Debug
|
|||
+
|
|||
if exist cmakecache.txt del cmakecache.txt |
|||
copy win\vs8cache.txt cmakecache.txt |
|||
-cmake -G "Visual Studio 8 2005 Win64"
|
|||
+cmake -G "Visual Studio 8 2005 Win64" -DCMAKE_BUILD_TYPE=%1
|
|||
copy cmakecache.txt win\vs8cache.txt |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue