database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge mysql.com:/home/jonas/src/mysql-4.1

Browse Source 
into mysql.com:/home/jonas/src/mysql-5.0


libmysql_r/Makefile.am:
  Auto merged
mysql-test/r/analyse.result:
  Auto merged
sql/sql_analyse.cc:
  Auto merged
This commit is contained in:
unknown
2005-01-12 11:24:46 +01:00
parent dd3cfa8d88 ed6c9afd6d
commit 40649e92f7
7 changed files with 93 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libmysql_r/Makefile.am
View File

@ -22,7 +22,7 @@
target = libmysqlclient_r.la
target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@
LIBS = @LIBS@ @openssl_libs@
LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@
INCLUDES = @MT_INCLUDES@ \
-I$(top_srcdir)/include $(openssl_includes) @ZLIB_INCLUDES@ \