mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-02-01 11:31:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

branches/zip: Remove innodb_redefine.h and all references to it. The

Browse source 
file has been redundant since r2278.

include/innodb_redefine.h: Remove.

include/sync0sync.h: Remove the definition of mutex_free that was added
because of innodb_redefine.h.

include/univ.i: Remove references to innodb_redefine.h.  Explain why
the C++ classes need to be renamed.

scripts/build-plugin.sh: Build InnoDB only once.  The file
innodb_redefine.h is no longer needed.
This commit is contained in:
marko 2008-02-08 12:23:17 +00:00
parent 70a539b087
commit 2c521319f2
4 changed files with 8 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/innodb_redefine.h
View file

@ -1,12 +0,0 @@
/* This file is needed for building a dynamic InnoDB plugin that
can replace the builtin InnoDB plugin in MySQL.
It must be generated as follows:
* compile the InnoDB plugin
* overwrite include/innodb_redefine.h with the following command
* compile the final InnoDB plugin
nm .libs/ha_innodb.so.0.0.0|
sed -ne 's/^[^ ]* . \([a-zA-Z][a-zA-Z0-9_]*\)$/#define \1 ibd_\1/p'|
grep -v 'innodb_hton_ptr\|builtin_innobase_plugin' > include/innodb_redefine.h
*/

4
include/sync0sync.h
View file

@ -76,10 +76,6 @@ the mutex is freed. Removes a mutex object from the mutex list. The mutex
is checked to be in the reset state. */
#undef mutex_free /* Fix for MacOS X */
#define mutex_free mutex0_free /* Fix for innodb_redefine.h;
we must not undefine symbols
defined there; thus, that file
will use mutex0_free. */
void
mutex_free(
/*=======*/

17
include/univ.i
View file

@ -10,19 +10,12 @@ Created 1/20/1994 Heikki Tuuri
#define univ_i
#ifdef MYSQL_DYNAMIC_PLUGIN
/* In the dynamic plugin, redefine all symbols not to conflict with
the symbols of a builtin InnoDB. The build process works as follows:
/* In the dynamic plugin, redefine some externally visible symbols
in order not to conflict with the symbols of a builtin InnoDB. */
* compile the InnoDB plugin using an empty include/innodb_redefine.h
* overwrite include/innodb_redefine.h with the following command
* compile the final InnoDB plugin
nm .libs/ha_innodb.so.0.0.0|
sed -ne 's/^[^ ]* . \([a-zA-Z][a-zA-Z0-9_]*\)$/#define \1 ibd_\1/p'|
grep -v 'innodb_hton_ptr\|builtin_innobase_plugin' > include/innodb_redefine.h
*/
# include "innodb_redefine.h"
/* Redefine all C++ classes here. */
/* Rename all C++ classes that contain virtual functions, because we
have not figured out how to apply the visibility=hidden attribute to
the virtual method table (vtable) in GCC 3. */
# define ha_innobase ha_innodb
#endif /* MYSQL_DYNAMIC_PLUGIN */

23
scripts/build-plugin.sh
View file

@ -144,23 +144,6 @@ if [ ! -f include/mysqld_error.h ]; then
(cd extra; $MAKE ../include/mysqld_error.h)
fi
# Compile the InnoDB plugin, we do this twice because after the first build
# we extract the global symbols from the .so and create a header file that
# renames the global symbols with a prefix of "ibd_". The second build is
# with the renamed global symbols.
(
cd $INNODIR
echo "Building InnoDB plugin first pass ..."
$MAKE > /dev/null
nm -g .libs/ha_innodb.so |
sed -ne 's/^[^ ]* . \([a-zA-Z][a-zA-Z0-9_]*\)$/#define \1 ibd_\1/p' |
grep -v 'innodb_hton_ptr\|builtin_innobase_plugin' \
> include/innodb_redefine.h
echo "Building InnoDB plugin second pass ..."
$MAKE > /dev/null
)
exit 0
# Compile the InnoDB plugin.
cd $INNODIR
exec $MAKE