diff options
| author | unknown <monty@mashka.mysql.fi> | 2003-11-18 18:54:27 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2003-11-18 18:54:27 +0200 |
| commit | 84281294eab2441a118d2c1414c6d6e531e89c5b (patch) | |
| tree | 21a08cbc0f6aecfbbbf13d5cac0d19bc67952322 /scripts | |
| parent | cde9c4299b1f77abed719dbacb278030010760e6 (diff) | |
| parent | c072804d51c2941a955747afc0dae802e8843845 (diff) | |
| download | mariadb-git-84281294eab2441a118d2c1414c6d6e531e89c5b.tar.gz | |
Merge with 4.0 tree
BitKeeper/etc/logging_ok:
auto-union
scripts/Makefile.am:
Auto merged
scripts/mysql_config.sh:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_handler.cc:
Auto merged
BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183:
Auto merged
BitKeeper/deleted/.del-mysql_fix_privilege_tables.sql:
Auto merged
BUILD/compile-pentium-gcov:
merge
myisam/mi_test2.c:
use original code
mysql-test/t/range.test:
Fixed comment
mysys/mf_keycache.c:
Fixed comments
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.am | 1 | ||||
| -rw-r--r-- | scripts/mysql_config.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 48592d2ff00..037adc64d39 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -120,6 +120,7 @@ SUFFIXES = .sh -e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\ -e 's!@''CLIENT_LIBS''@!@CLIENT_LIBS@!' \ -e 's!@''LIBS''@!@LIBS@!' \ + -e 's!@''WRAPLIBS''@!@WRAPLIBS@!' \ -e 's!@''innodb_system_libs''@!@innodb_system_libs@!' \ -e 's!@''openssl_libs''@!@openssl_libs@!' \ -e 's!@''VERSION''@!@VERSION@!' \ diff --git a/scripts/mysql_config.sh b/scripts/mysql_config.sh index 6b543bf4a07..051f3fa9c14 100644 --- a/scripts/mysql_config.sh +++ b/scripts/mysql_config.sh @@ -92,7 +92,7 @@ libs_r="$ldflags -L$pkglibdir -lmysqlclient_r @LIBS@ @openssl_libs@" libs_r=`echo "$libs_r" | sed -e 's; \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'` cflags="-I$pkgincludedir @CFLAGS@" include="-I$pkgincludedir" -embedded_libs="$ldflags -L$pkglibdir -lmysqld @LIBS@ @innodb_system_libs@" +embedded_libs="$ldflags -L$pkglibdir -lmysqld @LIBS@ @WRAPLIBS@ @innodb_system_libs@" embedded_libs=`echo "$embedded_libs" | sed -e 's; \+; ;g' | sed -e 's;^ *;;' | sed -e 's; *\$;;'` # Remove some options that a client doesn't have to care about |