diff options
| author | unknown <acurtis@xiphis.org> | 2006-05-02 04:11:00 -0700 |
|---|---|---|
| committer | unknown <acurtis@xiphis.org> | 2006-05-02 04:11:00 -0700 |
| commit | ad4c32c89a1b12a38518b589c944ac06ae023b50 (patch) | |
| tree | 5d9330a6ecd663b4caf7da376b8a6372a8edeac7 /config | |
| parent | b0efe477fbec37c273098bc85263b195544f2edc (diff) | |
| download | mariadb-git-ad4c32c89a1b12a38518b589c944ac06ae023b50.tar.gz | |
WL#3201 additional post-review fixes
config/ac-macros/plugins.m4:
remove unneccessary `ifelse'
add comment, add missing dnl
configure.in:
change description for heap engine
include/mysql/plugin.h:
change macro name
sql/ha_berkeley.cc:
store strings statically for use in handlerton and plugin structures
sql/ha_federated.cc:
store strings statically for use in handlerton and plugin structures
sql/ha_heap.cc:
store strings statically for use in handlerton and plugin structures
sql/ha_innodb.cc:
store strings statically for use in handlerton and plugin structures
sql/ha_myisam.cc:
store strings statically for use in handlerton and plugin structures
sql/ha_myisammrg.cc:
store strings statically for use in handlerton and plugin structures
sql/ha_ndbcluster.cc:
store strings statically for use in handlerton and plugin structures
sql/ha_partition.cc:
store strings statically for use in handlerton and plugin structures
storage/archive/ha_archive.cc:
store strings statically for use in handlerton and plugin structures
storage/blackhole/ha_blackhole.cc:
store strings statically for use in handlerton and plugin structures
storage/csv/ha_tina.cc:
store strings statically for use in handlerton and plugin structures
storage/example/ha_example.cc:
store strings statically for use in handlerton and plugin structures
Diffstat (limited to 'config')
| -rw-r--r-- | config/ac-macros/plugins.m4 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config/ac-macros/plugins.m4 b/config/ac-macros/plugins.m4 index 0ca952c4354..385b6f1d66c 100644 --- a/config/ac-macros/plugins.m4 +++ b/config/ac-macros/plugins.m4 @@ -38,9 +38,7 @@ AC_DEFUN([_MYSQL_PLUGIN],[ _MYSQL_PLUGAPPEND([__mysql_plugin_list__],[$1]) m4_define([MYSQL_PLUGIN_NAME_]AS_TR_CPP([$1]), [$3]) m4_define([MYSQL_PLUGIN_DESC_]AS_TR_CPP([$1]), [$4]) - ifelse([$5], [], [], [ - _MYSQL_PLUGAPPEND_META([$1], $5) - ]) + _MYSQL_PLUGAPPEND_META([$1], $5) ]) ]) @@ -351,11 +349,13 @@ AC_DEFUN([__MYSQL_EMIT_CHECK_PLUGIN],[ else m4_ifdef([$7],[ ifelse(m4_bregexp($7, [^lib[^.]+\.a$]), -2, [ +dnl change above "-2" to "0" to enable this section +dnl Although this is "pretty", it breaks libmysqld build m4_ifdef([$6],[ mysql_use_plugin_dir="$6" mysql_plugin_libs="$mysql_plugin_libs -L[\$(top_builddir)]/$6" ]) - mysql_plugin_libs="$mysql_plugin_libs + mysql_plugin_libs="$mysql_plugin_libs dnl [-l]m4_bregexp($7, [^lib\([^.]+\)], [\1])" ], m4_bregexp($7, [^\\\$]), 0, [ m4_ifdef([$6],[ |