diff options
| -rw-r--r-- | sql/debug_sync.cc | 1 | ||||
| -rw-r--r-- | storage/sphinx/Makefile.am | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sql/debug_sync.cc b/sql/debug_sync.cc index 23a649a89fa..c9c580c6442 100644 --- a/sql/debug_sync.cc +++ b/sql/debug_sync.cc @@ -1719,6 +1719,7 @@ static void debug_sync_execute(THD *thd, st_debug_sync_action *action) if (action->execute) { const char *old_proc_info; + LINT_INIT(old_proc_info); action->execute--; diff --git a/storage/sphinx/Makefile.am b/storage/sphinx/Makefile.am index 6f9c7bc1ae2..ce4324ae5cb 100644 --- a/storage/sphinx/Makefile.am +++ b/storage/sphinx/Makefile.am @@ -35,17 +35,17 @@ pkgplugin_LTLIBRARIES = @plugin_sphinx_shared_target@ sphinx.la ha_sphinx_la_LDFLAGS = -module -rpath $(MYSQLLIBdir) \ -L$(top_builddir)/libservices -lmysqlservices -ha_sphinx_la_CXXFLAGS= $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN +ha_sphinx_la_CXXFLAGS= $(AM_CXXFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_sphinx_la_CFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN ha_sphinx_la_SOURCES = ha_sphinx.cc sphinx_la_LDFLAGS = -module -sphinx_la_CXXFLAGS = $(AM_CFLAGS) +sphinx_la_CXXFLAGS = $(AM_CXXFLAGS) sphinx_la_CFLAGS = $(AM_CFLAGS) sphinx_la_SOURCES = snippets_udf.cc noinst_LTLIBRARIES = @plugin_sphinx_static_target@ -libsphinx_la_CXXFLAGS = $(AM_CFLAGS) +libsphinx_la_CXXFLAGS = $(AM_CXXFLAGS) libsphinx_la_CFLAGS = $(AM_CFLAGS) libsphinx_la_SOURCES= ha_sphinx.cc |