From 04ae1a65edf1bfb98bb682340d0e3608a420b4f0 Mon Sep 17 00:00:00 2001 From: JoungKyun Kim Date: Wed, 12 Oct 2016 19:34:00 +0900 Subject: [PATCH] fixed #6 build failure with mysql 5.7 --- src/Makefile.am | 2 +- src/Makefile.in | 2 +- travis/trusty-mysql.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 99a5d4b..b3dac90 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,7 +32,7 @@ noinst_HEADERS = mysql_aes256.h my_aes.h rijndael.h mysql_aes256_conflict.h lib_LTLIBRARIES += lib_mysqludf_aes256.la lib_mysqludf_aes256_la_SOURCES = mysql_aes256.c my_aes.c rijndael.c lib_mysqludf_aes256_la_LIBADD = -lpthread -lib_mysqludf_aes256_la_CFLAGS = -DMYSQL_SERVER +lib_mysqludf_aes256_la_CFLAGS = -DMYSQL_SERVER -DMYSQL_DYNAMIC_PLUGIN #lib_mysqludf_aes256_la_CFLAGS = -DSTANDARD -DMYSQL_SERVER lib_mysqludf_aes256_la_CPPFLAGS = @MYSQL_HEADER@ diff --git a/src/Makefile.in b/src/Makefile.in index f980900..3a98fd8 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -343,7 +343,7 @@ BUILT_SOURCES = mysql_aes256_config.h noinst_HEADERS = mysql_aes256.h my_aes.h rijndael.h mysql_aes256_conflict.h lib_mysqludf_aes256_la_SOURCES = mysql_aes256.c my_aes.c rijndael.c lib_mysqludf_aes256_la_LIBADD = -lpthread -lib_mysqludf_aes256_la_CFLAGS = -DMYSQL_SERVER +lib_mysqludf_aes256_la_CFLAGS = -DMYSQL_SERVER -DMYSQL_DYNAMIC_PLUGIN #lib_mysqludf_aes256_la_CFLAGS = -DSTANDARD -DMYSQL_SERVER lib_mysqludf_aes256_la_CPPFLAGS = @MYSQL_HEADER@ DISTCLEANFILES = *~ diff --git a/travis/trusty-mysql.sh b/travis/trusty-mysql.sh index 3e00472..c770c73 100755 --- a/travis/trusty-mysql.sh +++ b/travis/trusty-mysql.sh @@ -13,7 +13,7 @@ case "$VER" in apt-get -y install software-properties-common add-apt-repository -y ppa:ondrej/mysql-${VER} - INSTPKG="mysql-server mysql-client libmysqlclient-dev libmysqld-dev" + INSTPKG="mysql-server mysql-client libmysqlclient-dev" ;; *) echo "Unsupport version \"$VER\"" > /dev/stdout