1
0
mirror of https://github.com/MariaDB/server.git synced 2025-05-28 13:01:41 +03:00

466 Commits

Author SHA1 Message Date
Sergey Vojtovich
94efc1c6b0 Fixed build failure on Win.
Reverted lost in the merge line.
2009-08-04 13:02:48 +05:00
Sergey Vojtovich
5444c400e4 Added fsp0types.h to source distribution. 2009-07-31 14:54:25 +05:00
Sergey Vojtovich
bae6276d45 Update to innoplug-1.0.4. 2009-07-30 17:42:56 +05:00
Sergey Vojtovich
1c2c168c66 This patch pretends to fix run-time symbols clash on Solaris:
- when finding out a way to hide symbols, make decision basing
  on compiler, not operating system.
- Sun Studio supports __hidden declaration specifier for this
  purpose.
2009-07-09 17:36:29 +05:00
Alexander Nozdrin
b05eeab593 Fix 5.1 build error. 2009-08-12 23:43:20 +04:00
Sergey Vojtovich
0a6edfad1f On Solaris shared objects must be linked from PIC code. 2009-07-03 15:06:19 +05:00
Sergey Vojtovich
9b78102aaf Fixed InnoDB plugin compilation failure from source distribution
on Windows.

Added missing file to a source distribution.
2009-06-25 19:16:40 +05:00
Sergey Vojtovich
0fa4924fe5 Fixed build failures.
storage/innodb_plugin/Makefile.am:
  Removed handler0vars.h from source distribution.
win/Makefile.am:
  Fixed incorrect merge.
2009-06-18 13:49:44 +05:00
Vladislav Vaintroub
87da3df623 merge 2009-06-17 16:32:16 +02:00
Vladislav Vaintroub
00182614bd Fixed type defintion for os_thread_id_t on 64 bit Windows.
It used to be declared as ulint, which is 32/64 bit integer depending on OS bitness.
However this declaration lead to problems with os_compare_and_swap_thread_id 
implementation which operated on 32 bit integers (InterlockedCompareExchange)

Using 64 bit int   lead to  wrong result in os_compare_and_swap_thread_id 
and to crash/assertion in  rw_lock_set_writer_id_and_recursion_flag()

The fix is to use 4 byte integer to os_thread_id type definition.
2009-06-17 16:14:08 +02:00
Sergey Vojtovich
8469eee8c3 When using bundled zlib, INNODB_PLUGIN was looking for
zlib headers in wrong location.

Fixed by using path exported by zlib.m4 macro.

storage/innodb_plugin/Makefile.am:
  Include zlib headers from a proper location.
2009-06-17 14:38:41 +05:00
Sergey Vojtovich
c182f70115 Removed legacy name for innodb_plugin SE, so --with[out]-innodb
option doesn't affect innodb_plugin.

Currently it works as following:
* configure without relevant options producing two dynamic plugins
* configure --with-plugin-innodb (or legacy --with-innodb) producing
  static standard InnoDB
* configure --without-plugin-innodb (or legacy --without-innodb)
  disabling standard InnoDB
* configure --with-plugin-innodb_plugin producing dynamic innodb_plugin
* configure --without-plugin-innodb_plugin disabling innodb_plugin

storage/innodb_plugin/plug.in:
  Removed legacy name for innodb_plugin SE.
2009-06-10 22:50:00 +05:00
Vladislav Vaintroub
768bbae90e Backport WL#3653 to 5.1 to enable bundled innodb plugin.
Remove custom DLL loader code from innodb plugin code, use 
symbols exported from mysqld.


storage/innodb_plugin/handler/ha_innodb.cc:
  Remove a Win32 workaround for current_thd.
  The original  problem that innodb plugin used
  value of TLS variable across DLL boundaries is 
  solved in MySQL server (current_thd is a function
  not TLS variable now)
storage/innodb_plugin/handler/handler0alter.cc:
  Remove custom delay loader
storage/innodb_plugin/handler/handler0vars.h:
  Remove custom delay loader
storage/innodb_plugin/handler/i_s.cc:
  Remove custom delay loader
storage/innodb_plugin/handler/win_delay_loader.cc:
  Remove custom delay loader
storage/innodb_plugin/plug.in:
  Remove commented out MYSQL_PLUGIN_STATIC, 
  CMake would not parse that correctly
2009-06-10 10:59:49 +02:00
Tomas Ulin
bf893bea7e add missing file in Makefile.am 2009-06-09 21:26:04 +02:00
Satya B
797cc5a739 Compile the Innodb plugin so that it can be installed as dynamic plugin only for now.
The Innodb plugin 1.0.4 can be installed dynamically using the 'INSTALL PLUGIN' syntax

If mysqld is already statically linked with the inbuilt innodb, it is not possible to 
install the innodb plugin 1.0.4 dynamically. Doing so would throw this error - Function
'innodb' already exists.

storage/innodb_plugin/Makefile.am:
  Remove references of 'storage/innobase' and use $(srcdir) instead. 
  Renamed the dynamic plugin library name to 'ha_innodb_plugin' so 
  that it can be installed along with inbuilt plugin.
storage/innodb_plugin/Makefile.in:
  Remove this file as it can be generated automatically by automake
  using the Makefile.am
storage/innodb_plugin/handler/ha_innodb.cc:
  Remove refernces to "storage/innobase" and the headers can be included directly.
  Declare the plugin with the new name innodb_plugin
storage/innodb_plugin/plug.in:
  Rename the plugin innobase as innodb_plugin
2009-05-29 18:30:29 +05:30
Satya B
3945d5e554 Adding innodb_plugin-1.0.4 as storage/innodb_plugin. 2009-05-27 15:15:59 +05:30