summaryrefslogtreecommitdiff
path: root/plugin
diff options
context:
space:
mode:
authorMichael Widenius <monty@askmonty.org>2011-02-25 20:15:27 +0200
committerMichael Widenius <monty@askmonty.org>2011-02-25 20:15:27 +0200
commit52b64be318d642149933da958d518ad9ee7fed20 (patch)
tree0aeb7ec43f03be21a874c67ffbeb1e52d8e78dba /plugin
parent6c610ed97964a6370e7082ca1fd1f11c4d6720ba (diff)
downloadmariadb-git-52b64be318d642149933da958d518ad9ee7fed20.tar.gz
Fixed compiler warnings
client/readline.cc: Initialize not used variable (to kill wrong compiler warning) mysql-test/suite/handler/aria.result: Updated test result mysql-test/suite/handler/handler.inc: Changed index to ensure rows are in a fixed order mysql-test/suite/handler/heap.result: Updated test result mysql-test/suite/handler/innodb.result: Updated test result mysql-test/suite/handler/myisam.result: Updated test result plugin/handler_socket/handlersocket/Makefile.am: Use CXX flags to compile sql/filesort.cc: Initialize variable that may be used sql/log.cc: Initialize not used variable (to kill wrong compiler warning) sql/opt_range_mrr.cc: Fixed cast to avoid compiler warning storage/xtradb/fil/fil0fil.c: Added cast to avoid compiler warning
Diffstat (limited to 'plugin')
-rw-r--r--plugin/handler_socket/handlersocket/Makefile.am6
1 files changed, 1 insertions, 5 deletions
diff --git a/plugin/handler_socket/handlersocket/Makefile.am b/plugin/handler_socket/handlersocket/Makefile.am
index f8e695b67f7..e00b7bc4ea4 100644
--- a/plugin/handler_socket/handlersocket/Makefile.am
+++ b/plugin/handler_socket/handlersocket/Makefile.am
@@ -1,11 +1,7 @@
-CXXFLAGS += -fimplicit-templates
pkgplugindir = $(PLUGIN_DIR)
noinst_HEADERS = database.hpp hstcpsvr.hpp hstcpsvr_worker.hpp mysql_incl.hpp
pkgplugin_LTLIBRARIES = handlersocket.la
handlersocket_la_LDFLAGS = -module ../libhsclient/libhsclient.la
-handlersocket_la_CFLAGS = $(MYSQL_INC) $(MYSQL_CFLAGS) $(AM_CFLAGS) \
- -I$(srcdir)/../libhsclient
-handlersocket_la_CXXFLAGS = $(MYSQL_INC) $(MYSQL_CFLAGS) $(AM_CFLAGS) \
- -I$(srcdir)/../libhsclient
+handlersocket_la_CXXFLAGS = $(MYSQL_INC) $(MYSQL_CFLAGS) $(AM_CXXFLAGS) -fimplicit-templates -I$(srcdir)/../libhsclient
handlersocket_la_SOURCES = database.cpp handlersocket.cpp \
hstcpsvr_worker.cpp hstcpsvr.cpp