summaryrefslogtreecommitdiff
path: root/libmysql_r
diff options
context:
space:
mode:
authormonty@mysql.com <>2003-11-20 22:30:48 +0200
committermonty@mysql.com <>2003-11-20 22:30:48 +0200
commitb01fcb4e1438dcc1f9a31bcab30b98b578d1704a (patch)
tree47f72b790e762b88773ac94032106a9fec3ee4a4 /libmysql_r
parent55e07608fd7bcb47bd92f744a07b7631aa91d9c6 (diff)
parentdd287a4cdf4b8937ce428678fa096134a5ae8a88 (diff)
downloadmariadb-git-b01fcb4e1438dcc1f9a31bcab30b98b578d1704a.tar.gz
Merge with 4.0 to get:
Fix for storing negative values in decimal fields Fix for FLUSH TABLE with HANDLER
Diffstat (limited to 'libmysql_r')
-rw-r--r--libmysql_r/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am
index 265e31fafdb..60c29a99762 100644
--- a/libmysql_r/Makefile.am
+++ b/libmysql_r/Makefile.am
@@ -19,7 +19,7 @@
target = libmysqlclient_r.la
target_defs = -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@
-## LIBS = @LIBS@
+LIBS = @LIBS@ @openssl_libs@
INCLUDES = @MT_INCLUDES@ -I$(top_srcdir)/include $(openssl_includes)