mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 18:41:56 +01:00
6b3a9caef9
Makefile.am: Changes to autoconf subst config/ac-macros/ha_berkeley.m4: simplify config/ac-macros/ha_ndbcluster.m4: simplify config/ac-macros/ha_partition.m4: simplify configure.in: strip configure of storage engine specific cruft and simplify extra/Makefile.am: changes to autoconf/automake subst libmysqld/Makefile.am: only compile storage engines if required. make find object file a little smarter libmysqld/examples/Makefile.am: changes to autoconf subst mysql-test/Makefile.am: remove storage engine specific cruft mysql-test/r/ps_1general.result: cannot gaurantee order of results from 'show storage engines' mysql-test/r/show_check.result: fix test - frm file fails to be deleted if it is invalid mysql-test/r/sql_mode.result: isam does not exist, test may need to be redone/fixed in 5.0 mysql-test/r/warnings.result: isam no longer exists mysql-test/t/ps_1general.test: cannot gaurantee order of results from 'show storage engines' mysql-test/t/show_check.test: fix test - frm file fails to be deleted if it is invalid mysql-test/t/sql_mode.test: isam does not exist, test may need to be redone/fixed in 5.0 mysql-test/t/system_mysql_db_fix.test: change isam to myisam mysql-test/t/view.test: change isam to myisam mysql-test/t/warnings.test: isam no longer exists sql/Makefile.am: Make storage engines "pluggable" stage 1 only compile storage engines if included sql/examples/ha_example.cc: handlerton work sql/examples/ha_example.h: handlerton work sql/examples/ha_tina.cc: handlerton work sql/examples/ha_tina.h: handlerton work sql/ha_archive.cc: handlerton work sql/ha_archive.h: handlerton work sql/ha_berkeley.cc: handlerton work sql/ha_berkeley.h: handlerton work sql/ha_blackhole.cc: handlerton work sql/ha_federated.cc: handlerton work sql/ha_federated.h: handlerton work sql/ha_heap.cc: handlerton work sql/ha_innodb.cc: handlerton work sql/ha_innodb.h: handlerton work sql/ha_myisam.cc: handlerton work sql/ha_myisammrg.cc: handlerton work sql/ha_ndbcluster.cc: handlerton work sql/ha_ndbcluster.h: handlerton work sql/ha_partition.cc: handlerton work sql/handler.cc: start removing storage engine specific cruft sql/handler.h: start removing storage engine specific cruft db_type for binlog handlerton handlerton flag for not-user-selectable storage engines sql/lex.h: start removing storage engine specific cruft sql/log.cc: handlerton work give binlog handlerton a 'real' db_type sql/mysql_priv.h: start removing storage engine specific cruft sql/mysqld.cc: start removing storage engine specific cruft sql/set_var.cc: start removing storage engine specific cruft sql/sp_head.cc: start removing storage engine specific cruft sql/sql_class.cc: start removing storage engine specific cruft sql/sql_class.h: start removing storage engine specific cruft sql/sql_lex.h: start removing storage engine specific cruft sql/sql_manager.cc: start removing storage engine specific cruft sql/sql_manager.h: start removing storage engine specific cruft sql/sql_parse.cc: start removing storage engine specific cruft sql/sql_partition.cc: start removing storage engine specific cruft sql/sql_prepare.cc: start removing storage engine specific cruft sql/sql_show.cc: start removing storage engine specific cruft sql/sql_table.cc: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE start removing storage engine specific cruft sql/sql_update.cc: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE sql/sql_yacc.yy: start removing storage engine specific cruft test if we should throw error sql/table.cc: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE sql/table.h: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE sql/unireg.cc: changed define from HAVE_PARTITION_DB to WITH_PARTITION_STORAGE_ENGINE storage/ndb/include/kernel/kernel_types.h: added my_config.h storage/ndb/include/ndb_global.h.in: added my_config.h storage/ndb/include/ndb_types.h.in: added my_config.h config/ac-macros/storage.m4: New BitKeeper file ``config/ac-macros/storage.m4'' sql/handlerton.cc.in: New BitKeeper file ``sql/handlerton.cc.in''
47 lines
1.8 KiB
Text
47 lines
1.8 KiB
Text
dnl ---------------------------------------------------------------------------
|
|
dnl Macro: MYSQL_STORAGE_ENGINE
|
|
dnl
|
|
dnl What it does:
|
|
dnl creates --with-xxx configure option
|
|
dnl adds HAVE_XXX to config.h
|
|
dnl appends &xxx_hton, to the list of hanldertons
|
|
dnl appends a dir to the list of source directories
|
|
dnl appends ha_xxx.cc to the list of handler files
|
|
dnl
|
|
dnl all names above are configurable with reasonable defaults.
|
|
dnl
|
|
dnl ---------------------------------------------------------------------------
|
|
|
|
AC_DEFUN([MYSQL_STORAGE_ENGINE],
|
|
[_MYSQL_STORAGE_ENGINE(
|
|
[$1], dnl name
|
|
m4_default([$2], [$1 storage engine]), dnl verbose name
|
|
m4_default([$3], [$1-storage-engine]), dnl with-name
|
|
m4_default([$4], no), dnl default
|
|
m4_default([$5], [WITH_]AS_TR_CPP([$1])[_STORAGE_ENGINE]),
|
|
m4_default([$6], $1[_hton]), dnl hton
|
|
m4_default([$7], []), dnl path to the code
|
|
m4_default([$8], [ha_$1.o]), dnl path to the handler in
|
|
m4_default([$9], []), dnl path to extra libraries
|
|
[$10], dnl code-if-set
|
|
)])
|
|
|
|
AC_DEFUN([_MYSQL_STORAGE_ENGINE],
|
|
[
|
|
AC_ARG_WITH([$3], AS_HELP_STRING([--with-$3], [enable $2 (default is $4)]),
|
|
[], [ [with_]m4_bpatsubst([$3], -, _)=['$4']])
|
|
AC_CACHE_CHECK([whether to use $2], [mysql_cv_use_]m4_bpatsubst([$3], -, _),
|
|
[mysql_cv_use_]m4_bpatsubst([$3], -, _)=[$with_]m4_bpatsubst([$3], -, _))
|
|
AH_TEMPLATE([$5], [Build $2])
|
|
if test "[$mysql_cv_use_]m4_bpatsubst([$3], -, _)" != no; then
|
|
AC_DEFINE([$5])
|
|
mysql_se_decls="${mysql_se_decls},$6"
|
|
mysql_se_htons="${mysql_se_htons},&$6"
|
|
mysql_se_dirs="$mysql_se_dirs $7"
|
|
mysql_se_objs="$mysql_se_objs $8"
|
|
mysql_se_libs="$mysql_se_libs $9"
|
|
$10
|
|
fi
|
|
])
|
|
|
|
dnl ---------------------------------------------------------------------------
|