diff options
| author | unknown <monty@donna.mysql.com> | 2000-10-14 03:20:00 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-10-14 03:20:00 +0300 |
| commit | 1198be81c2037ed14854e19c168028ee62c2390c (patch) | |
| tree | 2b927866df3f6edcf7fe5420c1bf881b962a4f75 /configure.in | |
| parent | 658f67d67f18c800594d7b6311543a8b9a1d199b (diff) | |
| parent | 518a621adf75a55cad471f82d926842f3bcbf997 (diff) | |
| download | mariadb-git-1198be81c2037ed14854e19c168028ee62c2390c.tar.gz | |
Merge
configure.in:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_yacc.yy:
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 059c263119d..efb746fffdc 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(sql/mysqld.cc) AC_CANONICAL_SYSTEM # The Docs Makefile.am parses this line! -AM_INIT_AUTOMAKE(mysql, 3.23.25-beta) +AM_INIT_AUTOMAKE(mysql, 3.23.26-beta) AM_CONFIG_HEADER(config.h) PROTOCOL_VERSION=10 @@ -662,7 +662,7 @@ case $SYSTEM_TYPE in ;; *hpux11.*) echo "Enabling pread/pwrite workaround for hpux 11" - CFLAGS="$CFLAGS -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE" + CFLAGS="$CFLAGS -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE -DHAVE_BROKEN_GETPASS" CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_PREAD -DDONT_USE_FINITE -D_INCLUDE_LONGLONG" if test "$with_named_thread" = "no" then |