Commit graph

12 commits

Author SHA1 Message Date
calvin
319f148e9c branches/zip: remove statically linked libraries from mysql
To make zlib and strings dynamically linked; mysqld will export
additional functions required by InnoDB.

Since the symbols will be resolved dynamically during runtime,
wdl_load_mapfile() is no longer able to make any function calls
to ones in mysqld. As the result, strtoull() (from strings.lib)
is replaced with _strtoui64().

rb://111

Approved by: Marko
2009-04-14 13:47:31 +00:00
calvin
ef6633bbf1 branches/zip: Rewrite CMakeLists.txt
CMakeLists.txt is completely rewritten:
- To replace the one written by mysql
- Print out some useful information, such as
  system name, directory, generator used,
  win64, Microsoft compiler, etc.
- Remove one workaround for mysqld.lib location.
  User does not need to specify a build type
2009-04-10 20:37:10 +00:00
calvin
62d80badd3 branches/zip: adjust build files on Windows
Adjust the patch positions based on the latest MySQL source.
Also add the patches to the .bat files for vs9.
2009-03-23 21:15:33 +00:00
vasil
23a752360e branches/zip:
Revert our temporary fix for Bug#40360 Binlog related errors with binlog off

This bug was fixed in MySQL code.

Our fix went into r2944 and r2947, but this patch does not entirely revert
those revisions because we want to leave the test case that was introduced
and also r2944 itself reverted r2935 and r2936. So if we completely revert
r2944 and r2947 then we would loose the test and will restore r2935 and
r2936.

This resolves Issue#108 We should remove ib_bin_log_is_engaged() once mysql
add an equivallent, see Bug#40360
2008-12-04 16:49:24 +00:00
vasil
13c01e48fd branches/zip:
Fix Mantis issue#103 mysql_addons.c depends on THD internals - please remove it

Use MySQL's thd_get_thread_id() instead of our own ib_thd_get_thread_id()
since MySQL implemented the former, see http://bugs.mysql.com/30930.

Approved by:	Marko (https://svn.innodb.com/rb/r/40, rb://40)
2008-12-04 16:10:08 +00:00
vasil
f5abca1618 branches/zip:
Non-functional change in win-plugin/win-plugin.diff: fix the file name
before the diff, this is irrelevant but it is nice to be the same as
the file name on the following line.
2008-11-27 21:33:48 +00:00
vasil
2a028069ea branches/zip:
* Remove a change from win-plugin/win-plugin.diff about time_t because
  MySQL has used VS2005 for building 5.1.30.

* Adjust the line numbers so the patch applies cleanly without fuzz and
  offset messages.

Submitted by:	Calvin
2008-11-27 21:31:18 +00:00
calvin
a019e95a43 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.
2008-10-31 08:38:26 +00:00
calvin
06bdbaa27f 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)
2008-10-29 08:09:41 +00:00
calvin
117ae892ad 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
2008-10-27 23:51:49 +00:00
calvin
0eed3f2edf Delete the recently added files from MySQL source tree, for
Windows plugin. Instead, we will commit diff only.
2008-10-07 06:16:39 +00:00
calvin
4a3ff30caa branches/zip: add MySQL files that will be changed for Windows plugin.
The following files are from MySQL source tree without any changes.
They will be changed for building Windows plugin. The original files
will be used as the base for diff purpose.

* CMakeLists.txt
* sql/CMakeLists.txt
* win/configure.js
2008-09-26 06:42:48 +00:00