diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-01-31 16:23:05 -0500 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-01-31 16:23:05 -0500 |
| commit | ffe6fae3bb0961a07a22c1e0fb90a4d123d22690 (patch) | |
| tree | 310051f9adb743a7d4761e730eb5dc7f6124cf95 /configure.in | |
| parent | 3d6e5feaf956d86751f3a1774fafd3bbaea3b1bc (diff) | |
| parent | 92a7c1ed9c6dec1fee17a830fdabe9272d6692bd (diff) | |
| download | mariadb-git-ffe6fae3bb0961a07a22c1e0fb90a4d123d22690.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
configure.in:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/range.result:
Auto merged
mysql-test/r/select.result:
Auto merged
mysql-test/t/select.test:
Auto merged
scripts/mysqld_multi.sh:
Auto merged
sql/item.cc:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.in b/configure.in index 48587e5b501..4f17cc5042e 100644 --- a/configure.in +++ b/configure.in @@ -2524,9 +2524,9 @@ linked_client_targets="linked_libmysql_sources" if test "$THREAD_SAFE_CLIENT" = "no" then - sql_client_dirs="strings regex mysys extra libmysql client" + sql_client_dirs="strings regex mysys dbug extra libmysql client" else - sql_client_dirs="strings regex mysys extra libmysql libmysql_r client" + sql_client_dirs="strings regex mysys dbug extra libmysql libmysql_r client" linked_client_targets="$linked_client_targets linked_libmysql_r_sources" AC_CONFIG_FILES(libmysql_r/Makefile) AC_DEFINE([THREAD_SAFE_CLIENT], [1], [Should be client be thread safe]) |