diff options
| author | monty@mashka.mysql.fi <> | 2003-08-19 00:08:08 +0300 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-08-19 00:08:08 +0300 |
| commit | 4f7512160bfd467e5d53c3e133e1842fac2737ce (patch) | |
| tree | df4f8c8cf4d399e322333c5516d5c19507b1fda8 /libmysqld | |
| parent | 2263e3e51faba531a0a7055dbf706a6a8719ad70 (diff) | |
| download | mariadb-git-4f7512160bfd467e5d53c3e133e1842fac2737ce.tar.gz | |
After merge fixes
Use server character set if --default-character-set is not used
Added convert_string() for more efficient alloc+character-set convert of strings
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index e61e7833451..b22ff9e5001 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -26,7 +26,8 @@ DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \ -DDATADIR="\"$(MYSQLDATAdir)\"" \ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" INCLUDES= @MT_INCLUDES@ @bdb_includes@ -I$(top_srcdir)/include \ - -I$(top_srcdir)/sql -I$(top_srcdir)/regex + -I$(top_srcdir)/sql -I$(top_srcdir)/regex \ + $(openssl_includes) noinst_LIBRARIES = libmysqld_int.a pkglib_LIBRARIES = libmysqld.a |