diff options
| author | unknown <kaa@kaamos.(none)> | 2008-02-20 00:37:51 +0300 |
|---|---|---|
| committer | unknown <kaa@kaamos.(none)> | 2008-02-20 00:37:51 +0300 |
| commit | 173efef438d1fcbb2569de266b88928f16921be5 (patch) | |
| tree | 50714ed39d62001f7f35f1ad46aa5e60d14f2fca /configure.in | |
| parent | a09384cba0fa5ed8ab84cc2ee070c7e5fb6d0c18 (diff) | |
| parent | 61c31af45d075e1aa1135b502209c04ca890425f (diff) | |
| download | mariadb-git-173efef438d1fcbb2569de266b88928f16921be5.tar.gz | |
Merge kaamos.(none):/data/src/opt/bug31236/my51-bug31236
into kaamos.(none):/data/src/opt/mysql-5.1-opt
configure.in:
Auto merged
mysql-test/r/strict.result:
Auto merged
sql/field.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/unireg.h:
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 2e623aacaf7..58fdf6d4375 100644 --- a/configure.in +++ b/configure.in @@ -1031,8 +1031,8 @@ case $SYSTEM_TYPE in ;; *hpux11.*) AC_MSG_WARN([Enabling workarounds for hpux 11]) - CFLAGS="$CFLAGS -DHPUX11 -DSNPRINTF_RETURN_TRUNC -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE -DHAVE_BROKEN_GETPASS -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT" - CXXFLAGS="$CXXFLAGS -DHPUX11 -DSNPRINTF_RETURN_TRUNC -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE -D_INCLUDE_LONGLONG -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT" + CFLAGS="$CFLAGS -DHPUX11 -DSNPRINTF_RETURN_TRUNC -DHAVE_BROKEN_PREAD -DHAVE_BROKEN_GETPASS -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT" + CXXFLAGS="$CXXFLAGS -DHPUX11 -DSNPRINTF_RETURN_TRUNC -DHAVE_BROKEN_PREAD -D_INCLUDE_LONGLONG -DNO_FCNTL_NONBLOCK -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT" if test "$with_named_thread" = "no" then AC_MSG_WARN([Using --with-named-thread=-lpthread]) |