Skip to content

Commit

Permalink
fixed #6 build failure with mysql 5.7
Browse files Browse the repository at this point in the history
  • Loading branch information
Joungkyun committed Oct 12, 2016
1 parent 6544ee0 commit 04ae1a6
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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@

Expand Down
2 changes: 1 addition & 1 deletion src/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -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 = *~
Expand Down
2 changes: 1 addition & 1 deletion travis/trusty-mysql.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 04ae1a6

Please sign in to comment.