Merge lp:~laurynas-biveinis/percona-server/merge-5.1.72 into lp:percona-server/5.5

[Laurynas Biveinis]

Merge MySQL 5.1.72.

http://jenkins.percona.com/job/percona-server-5.1-param/578/

Merge MySQL 5.1.72, implementing
https://blueprints.launchpad.net/percona-server/+spec/merge-5.1.72.

An automerge, with the exception of changes in buf_page_get_gen() for
http://bugs.mysql.com/bug.php?id=61132.

Import updated man pages from mysql-5.1.72.tar.gz.

=== modified file 'Makefile'
--- Makefile	2013-08-27 14:41:58 +0000
+++ Makefile	2013-10-11 13:09:36 +0000
@@ -1,5 +1,10 @@
+<<<<<<< TREE
 MYSQL_VERSION=5.5.33
 PERCONA_SERVER_VERSION=rel31.1
+=======
+MYSQL_VERSION=5.1.72
+PERCONA_SERVER_VERSION=rel14.10
+>>>>>>> MERGE-SOURCE
 PERCONA_SERVER         ?=Percona-Server-$(MYSQL_VERSION)-$(PERCONA_SERVER_VERSION)
 PERCONA_SERVER_SHORT_1 ?=Percona-Server-$(MYSQL_VERSION)
 PERCONA_SERVER_SHORT_2 ?=Percona-Server
 
=== added file 'Percona-Server/BUILD/Makefile.am.OTHER'
--- Percona-Server/BUILD/Makefile.am.OTHER	1970-01-01 00:00:00 +0000
+++ Percona-Server/BUILD/Makefile.am.OTHER	2013-10-11 13:09:36 +0000
@@ -0,0 +1,82 @@
+# Copyright (c) 2002, 2004-2008 MySQL AB
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public
+# License as published by the Free Software Foundation; version 2
+# of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with this library; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA
+
+## Process this file with automake to create Makefile.in
+
+EXTRA_DIST =		FINISH.sh \
+			SETUP.sh \
+			autorun.sh \
+			build_mccge.sh \
+			check-cpu \
+			cleanup \
+			compile-alpha \
+			compile-alpha-ccc \
+			compile-alpha-cxx \
+			compile-alpha-debug \
+			compile-amd64-debug-max \
+			compile-amd64-debug-max-no-ndb \
+			compile-amd64-gcov \
+			compile-amd64-gprof \
+			compile-amd64-max \
+			compile-amd64-max-sci \
+			compile-amd64-valgrind-max \
+			compile-darwin-mwcc \
+			compile-dist \
+			compile-hpux11-parisc2-aCC \
+			compile-ia64-debug-max \
+			compile-irix-mips64-mipspro \
+			compile-pentium \
+			compile-pentium-debug \
+			compile-pentium-debug-max \
+			compile-pentium-debug-max-no-embedded \
+			compile-pentium-debug-max-no-ndb \
+			compile-pentium-debug-openssl \
+			compile-pentium-debug-yassl \
+			compile-pentium-gcov \
+			compile-pentium-gprof \
+			compile-pentium-icc \
+			compile-pentium-icc-valgrind-max \
+			compile-pentium-icc-yassl \
+			compile-pentium-max \
+			compile-pentium-myodbc \
+			compile-pentium-mysqlfs-debug \
+			compile-pentium-pgcc \
+			compile-pentium-valgrind-max \
+			compile-pentium64 \
+			compile-pentium64-debug \
+			compile-pentium64-debug-max \
+			compile-pentium64-gcov \
+			compile-pentium64-gprof \
+			compile-pentium64-max \
+			compile-pentium64-max-sci \
+			compile-pentium64-valgrind-max \
+			compile-ppc \
+			compile-ppc-debug \
+			compile-ppc-debug-max \
+			compile-ppc-debug-max-no-ndb \
+			compile-ppc-max \
+			compile-solaris-amd64 \
+			compile-solaris-amd64-debug \
+			compile-solaris-amd64-forte \
+			compile-solaris-amd64-forte-debug \
+			compile-solaris-sparc \
+			compile-solaris-sparc-debug \
+			compile-solaris-sparc-forte \
+			compile-solaris-sparc-purify
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
 
=== modified file 'Percona-Server/BUILD/autorun.sh'
--- Percona-Server/BUILD/autorun.sh	2013-03-20 16:52:15 +0000
+++ Percona-Server/BUILD/autorun.sh	2013-10-11 13:09:36 +0000
@@ -1,6 +1,10 @@
 #!/bin/sh
 
+<<<<<<< TREE
 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+=======
+# Copyright (c) 2005-2007 MySQL AB
+>>>>>>> MERGE-SOURCE
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Library General Public
@@ -14,8 +18,13 @@
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
+<<<<<<< TREE
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 # MA 02110-1301, USA
+=======
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA
+>>>>>>> MERGE-SOURCE
 
 # Create MySQL cmake configure wrapper
 
 
=== modified file 'Percona-Server/BUILD/build_mccge.sh'
--- Percona-Server/BUILD/build_mccge.sh	2013-03-20 16:52:15 +0000
+++ Percona-Server/BUILD/build_mccge.sh	2013-10-11 13:09:36 +0000
@@ -14,8 +14,13 @@
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
+<<<<<<< TREE
 # Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
 # MA 02110-1301, USA
+=======
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+# MA 02110-1301, USA
+>>>>>>> MERGE-SOURCE
 
 die()
 {
 
=== added file 'Percona-Server/BUILD/compile-alpha-ccc.OTHER'
--- Percona-Server/BUILD/compile-alpha-ccc.OTHER	1970-01-01 00:00:00 +0000
+++ Percona-Server/BUILD/compile-alpha-ccc.OTHER	2013-10-11 13:09:36 +0000
@@ -0,0 +1,56 @@
+#! /bin/sh
+
+# Copyright (c) 2000, 2005, 2007 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+/bin/rm -f */.deps/*.P */*.o
+make -k maintainer-clean
+/bin/rm -f */.deps/*.P */*.o
+/bin/rm -f config.cache mysql-*.tar.gz
+
+path=`dirname $0`
+. "$path/autorun.sh"
+
+CC=ccc CFLAGS="-fast -O3 -fomit-frame-pointer" CXX=gcc CXXFLAGS="-O6 -fomit-frame-pointer -felide-constructors -fno-exceptions -fno-rtti -mcpu=ev6 -Wa,-mev6" CXXLDFLAGS='/usr/lib/compaq/libots-2.2.7/libots.so /usr/lib/compaq/cpml-5.0.0/libcpml_ev6.a' ./configure --prefix=/usr/local/mysql --disable-shared --with-extra-charsets=complex --enable-thread-safe-client
+make
+rm */.deps/*
+make
+if [ $? = 0 ]
+then
+  rm */.deps/*
+  bin/mysqladmin shutdown
+  sur make install
+  if [ $? = 0 ]
+  then
+     scripts/make_binary_distribution
+  fi
+fi
+
+exit
+
+# This should give better performance by compiling many files at once, but
+# according to our benchmarks there isn't any real difference.
+
+pwd=`pwd`
+for i in */make-ccc
+do
+   cd `dirname $i`
+   make-ccc
+   cd $pwd
+done
+cd sql
+rm mysqld .deps/*.P
+make mysqld
+cd $pwd
 
=== added file 'Percona-Server/BUILD/compile-alpha-cxx.OTHER'
--- Percona-Server/BUILD/compile-alpha-cxx.OTHER	1970-01-01 00:00:00 +0000
+++ Percona-Server/BUILD/compile-alpha-cxx.OTHER	2013-10-11 13:09:36 +0000
@@ -0,0 +1,58 @@
+#! /bin/sh
+
+# Copyright (c) 2000, 2001, 2003, 2005-2007 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+/bin/rm -f */.deps/*.P */*.o
+make -k maintainer-clean
+/bin/rm -f */.deps/*.P */*.o
+/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache mysql-*.tar.gz
+
+path=`dirname $0`
+. "$path/autorun.sh"
+
+CC=ccc CFLAGS="-fast" CXX=cxx CXXFLAGS="-fast -noexceptions -nortti" ./configure --prefix=/usr/local/mysql --disable-shared --with-extra-charsets=complex --enable-thread-safe-client --with-mysqld-ldflags=-non_shared --with-client-ldflags=-non_shared --without-extra-tools --disable-dependency-tracking
+
+make -j2
+find . -name ".deps" | xargs rm -r 
+make
+if [ $? = 0 ]
+then
+  find . -name ".deps" | xargs rm -r 
+  bin/mysqladmin shutdown
+  sur make install
+  if [ $? = 0 ]
+  then
+     scripts/make_binary_distribution
+  fi
+  make test
+fi
+
+exit
+
+# This should give better performance by compiling many files at once, but
+# according to our benchmarks there isn't any real difference.
+
+pwd=`pwd`
+for i in */make-ccc
+do
+   cd `dirname $i`
+   make-ccc
+   cd $pwd
+done
+cd sql
+rm mysqld .deps/*.P
+make mysqld
+cd $pwd
 
=== modified file 'Percona-Server/BUILD/compile-alpha-debug'
--- Percona-Server/BUILD/compile-alpha-debug	2013-03-20 16:52:15 +0000
+++ Percona-Server/BUILD/compile-alpha-debug	2013-10-11 13:09:36 +0000
@@ -1,7 +1,11 @@
 #! /bin/sh
 
+<<<<<<< TREE
 # Copyright (c) 2000, 2001, 2005-2007 MySQL AB
 # Use is subject to license terms
+=======
+# Copyright (c) 2000, 2001, 2005-2007 MySQL AB
+>>>>>>> MERGE-SOURCE
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'Percona-Server/BUILD/compile-amd64-debug-max'
--- Percona-Server/BUILD/compile-amd64-debug-max	2013-03-20 16:52:15 +0000
+++ Percona-Server/BUILD/compile-amd64-debug-max	2013-10-11 13:09:36 +0000
@@ -1,7 +1,11 @@
 #! /bin/sh
 
+<<<<<<< TREE
 # Copyright (c) 2005, 2006 MySQL AB
 # Use is subject to license terms
+=======
+# Copyright (c) 2005, 2006 MySQL AB
+>>>>>>> MERGE-SOURCE
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'Percona-Server/BUILD/compile-amd64-max'
--- Percona-Server/BUILD/compile-amd64-max	2013-03-20 16:52:15 +0000
+++ Percona-Server/BUILD/compile-amd64-max	2013-10-11 13:09:36 +0000
@@ -1,7 +1,11 @@
 #! /bin/sh
 
+<<<<<<< TREE
 # Copyright (c) 2005, 2006 MySQL AB
 # Use is subject to license terms
+=======
+# Copyright (c) 2005, 2006 MySQL AB
+>>>>>>> MERGE-SOURCE
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'Percona-Server/BUILD/compile-amd64-valgrind-max'
=== modified file 'Percona-Server/BUILD/compile-darwin-mwcc'
--- Percona-Server/BUILD/compile-darwin-mwcc	2013-03-20 16:52:15 +0000
+++ Percona-Server/BUILD/compile-darwin-mwcc	2013-10-11 13:09:36 +0000
@@ -1,7 +1,11 @@
 #! /bin/sh
 
+<<<<<<< TREE
 # Copyright (c) 2005, 2006 MySQL AB
 # Use is subject to license terms
+=======
+# Copyright (c) 2005, 2006 MySQL AB
+>>>>>>> MERGE-SOURCE
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'Percona-Server/BUILD/compile-hpux11-parisc2-aCC'
--- Percona-Server/BUILD/compile-hpux11-parisc2-aCC	2013-03-20 16:52:15 +0000
+++ Percona-Server/BUILD/compile-hpux11-parisc2-aCC	2013-10-11 13:09:36 +0000
@@ -1,7 +1,11 @@
 #!/bin/sh
 
+<<<<<<< TREE
 # Copyright (c) 2004, 2005, 2007 MySQL AB
 # Use is subject to license terms
+=======
+# Copyright (c) 2004, 2005, 2007 MySQL AB
+>>>>>>> MERGE-SOURCE
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'Percona-Server/BUILD/compile-ia64-debug-max'
--- Percona-Server/BUILD/compile-ia64-debug-max	2013-03-20 16:52:15 +0000
+++ Percona-Server/BUILD/compile-ia64-debug-max	2013-10-11 13:09:36 +0000
@@ -1,6 +1,10 @@
 #! /bin/sh
 
+<<<<<<< TREE
 # Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+=======
+# Copyright (c) 2001, 2005-2007 MySQL AB
+>>>>>>> MERGE-SOURCE
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -13,7 +17,11 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
+<<<<<<< TREE
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+=======
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+>>>>>>> MERGE-SOURCE
 
 gmake -k maintainer-clean || true 
 /bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache
 
=== modified file 'Percona-Server/BUILD/compile-irix-mips64-mipspro'
--- Percona-Server/BUILD/compile-irix-mips64-mipspro	2013-03-20 16:52:15 +0000
+++ Percona-Server/BUILD/compile-irix-mips64-mipspro	2013-10-11 13:09:36 +0000
@@ -1,7 +1,11 @@
 #!/bin/sh
 
+<<<<<<< TREE
 # Copyright (c) 2004, 2005, 2007 MySQL AB
 # Use is subject to license terms
+=======
+# Copyright (c) 2004, 2005, 2007 MySQL AB
+>>>>>>> MERGE-SOURCE
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'Percona-Server/BUILD/compile-ndb-autotest'
=== modified file 'Percona-Server/BUILD/compile-pentium'
--- Percona-Server/BUILD/compile-pentium	2013-03-20 16:52:15 +0000
+++ Percona-Server/BUILD/compile-pentium	2013-10-11 13:09:36 +0000
@@ -1,7 +1,11 @@
 #! /bin/sh
 
+<<<<<<< TREE
 # Copyright (c) 2000-2002, 2007 MySQL AB
 # Use is subject to license terms
+=======
+# Copyright (c) 2000-2002, 2007 MySQL AB
+>>>>>>> MERGE-SOURCE
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'Percona-Server/BUILD/compile-pentium-debug'
--- Percona-Server/BUILD/compile-pentium-debug	2013-03-20 16:52:15 +0000
+++ Percona-Server/BUILD/compile-pentium-debug	2013-10-11 13:09:36 +0000
@@ -13,7 +13,11 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
+<<<<<<< TREE
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+=======
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+>>>>>>> MERGE-SOURCE
 
 path=`dirname $0`
 . "$path/SETUP.sh"
 
=== modified file 'Percona-Server/BUILD/compile-pentium-debug-max'
--- Percona-Server/BUILD/compile-pentium-debug-max	2013-03-20 16:52:15 +0000
+++ Percona-Server/BUILD/compile-pentium-debug-max	2013-10-11 13:09:36 +0000
@@ -13,7 +13,11 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
+<<<<<<< TREE
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+=======
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+>>>>>>> MERGE-SOURCE
 
 path=`dirname $0`
 . "$path/SETUP.sh"
 
=== modified file 'Percona-Server/BUILD/compile-pentium-debug-max-no-embedded'
--- Percona-Server/BUILD/compile-pentium-debug-max-no-embedded	2013-03-20 16:52:15 +0000
+++ Percona-Server/BUILD/compile-pentium-debug-max-no-embedded	2013-10-11 13:09:36 +0000
@@ -1,7 +1,11 @@
 #! /bin/sh
 
+<<<<<<< TREE
 # Copyright (c) 2004-2006 MySQL AB
 # Use is subject to license terms
+=======
+# Copyright (c) 2004-2006 MySQL AB
+>>>>>>> MERGE-SOURCE
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'Percona-Server/BUILD/compile-pentium-debug-max-no-ndb'
=== modified file 'Percona-Server/BUILD/compile-pentium-debug-openssl'
--- Percona-Server/BUILD/compile-pentium-debug-openssl	2013-03-20 16:52:15 +0000
+++ Percona-Server/BUILD/compile-pentium-debug-openssl	2013-10-11 13:09:36 +0000
@@ -1,6 +1,10 @@
 #! /bin/sh
 
+<<<<<<< TREE
 # Copyright (c) 2001, 2010, Oracle and/or its affiliates. All rights reserved.
+=======
+# Copyright (c) 2001, 2003, 2006 MySQL AB
+>>>>>>> MERGE-SOURCE
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -13,7 +17,11 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
+<<<<<<< TREE
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+=======
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+>>>>>>> MERGE-SOURCE
 
 path=`dirname $0`
 . "$path/SETUP.sh"
 
=== modified file 'Percona-Server/BUILD/compile-pentium-debug-yassl'
--- Percona-Server/BUILD/compile-pentium-debug-yassl	2013-03-20 16:52:15 +0000
+++ Percona-Server/BUILD/compile-pentium-debug-yassl	2013-10-11 13:09:36 +0000
@@ -1,6 +1,10 @@
 #! /bin/sh
 
+<<<<<<< TREE
 # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
+=======
+# Copyright (c) 2005, 2006 MySQL AB
+>>>>>>> MERGE-SOURCE
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -13,7 +17,11 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
+<<<<<<< TREE
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+=======
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+>>>>>>> MERGE-SOURCE
 
 path=`dirname $0`
 . "$path/SETUP.sh"
 
=== modified file 'Percona-Server/BUILD/compile-pentium-max'
--- Percona-Server/BUILD/compile-pentium-max	2013-03-20 16:52:15 +0000
+++ Percona-Server/BUILD/compile-pentium-max	2013-10-11 13:09:36 +0000
@@ -1,7 +1,11 @@
 #! /bin/sh
 
+<<<<<<< TREE
 # Copyright (c) 2001-2006 MySQL AB
 # Use is subject to license terms
+=======
+# Copyright (c) 2001-2006 MySQL AB
+>>>>>>> MERGE-SOURCE
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'Percona-Server/BUILD/compile-pentium-pgcc'
--- Percona-Server/BUILD/compile-pentium-pgcc	2013-03-20 16:52:15 +0000
+++ Percona-Server/BUILD/compile-pentium-pgcc	2013-10-11 13:09:36 +0000
@@ -1,7 +1,11 @@
 #! /bin/sh
 
+<<<<<<< TREE
 # Copyright (c) 2000, 2001, 2005, 2007 MySQL AB
 # Use is subject to license terms
+=======
+# Copyright (c) 2000, 2001, 2005, 2007 MySQL AB
+>>>>>>> MERGE-SOURCE
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'Percona-Server/BUILD/compile-pentium-valgrind-max-no-ndb'
=== modified file 'Percona-Server/BUILD/compile-pentium64'
--- Percona-Server/BUILD/compile-pentium64	2013-03-20 16:52:15 +0000
+++ Percona-Server/BUILD/compile-pentium64	2013-10-11 13:09:36 +0000
@@ -14,8 +14,13 @@
 #
 # You should have received a copy of the GNU Library General Public
 # License along with this library; if not, write to the Free
+<<<<<<< TREE
 # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA 02110-1301, USA
+=======
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+# MA 02110-1301, USA.
+>>>>>>> MERGE-SOURCE
 
 path=`dirname $0`
 . "$path/SETUP.sh"
 
=== modified file 'Percona-Server/BUILD/compile-pentium64-debug'
--- Percona-Server/BUILD/compile-pentium64-debug	2013-03-20 16:52:15 +0000
+++ Percona-Server/BUILD/compile-pentium64-debug	2013-10-11 13:09:36 +0000
@@ -13,7 +13,11 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
+<<<<<<< TREE
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+=======
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+>>>>>>> MERGE-SOURCE
 
 path=`dirname $0`
 . "$path/SETUP.sh"
 
=== modified file 'Percona-Server/BUILD/compile-pentium64-debug-max'
--- Percona-Server/BUILD/compile-pentium64-debug-max	2013-03-20 16:52:15 +0000
+++ Percona-Server/BUILD/compile-pentium64-debug-max	2013-10-11 13:09:36 +0000
@@ -13,7 +13,11 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
+<<<<<<< TREE
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+=======
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+>>>>>>> MERGE-SOURCE
 
 path=`dirname $0`
 . "$path/SETUP.sh"
 
=== modified file 'Percona-Server/BUILD/compile-ppc-debug'
--- Percona-Server/BUILD/compile-ppc-debug	2013-03-20 16:52:15 +0000
+++ Percona-Server/BUILD/compile-ppc-debug	2013-10-11 13:09:36 +0000
@@ -1,7 +1,11 @@
 #! /bin/sh
 
+<<<<<<< TREE
 # Copyright (c) 2004, 2006 MySQL AB
 # Use is subject to license terms
+=======
+# Copyright (c) 2004, 2006 MySQL AB
+>>>>>>> MERGE-SOURCE
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'Percona-Server/BUILD/compile-ppc-debug-max'
--- Percona-Server/BUILD/compile-ppc-debug-max	2013-03-20 16:52:15 +0000
+++ Percona-Server/BUILD/compile-ppc-debug-max	2013-10-11 13:09:36 +0000
@@ -1,7 +1,11 @@
 #! /bin/sh
 
+<<<<<<< TREE
 # Copyright (c) 2004-2006 MySQL AB
 # Use is subject to license terms
+=======
+# Copyright (c) 2004-2006 MySQL AB
+>>>>>>> MERGE-SOURCE
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'Percona-Server/BUILD/compile-ppc-debug-max-no-ndb'
--- Percona-Server/BUILD/compile-ppc-debug-max-no-ndb	2013-03-20 16:52:15 +0000
+++ Percona-Server/BUILD/compile-ppc-debug-max-no-ndb	2013-10-11 13:09:36 +0000
@@ -1,7 +1,11 @@
 #! /bin/sh
 
+<<<<<<< TREE
 # Copyright (c) 2005, 2006 MySQL AB
 # Use is subject to license terms
+=======
+# Copyright (c) 2005, 2006 MySQL AB
+>>>>>>> MERGE-SOURCE
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'Percona-Server/BUILD/compile-ppc-max'
--- Percona-Server/BUILD/compile-ppc-max	2013-03-20 16:52:15 +0000
+++ Percona-Server/BUILD/compile-ppc-max	2013-10-11 13:09:36 +0000
@@ -1,7 +1,11 @@
 #! /bin/sh
 
+<<<<<<< TREE
 # Copyright (c) 2004-2006 MySQL AB
 # Use is subject to license terms
+=======
+# Copyright (c) 2004-2006 MySQL AB
+>>>>>>> MERGE-SOURCE
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'Percona-Server/BUILD/compile-solaris-sparc-debug'
--- Percona-Server/BUILD/compile-solaris-sparc-debug	2013-03-20 16:52:15 +0000
+++ Percona-Server/BUILD/compile-solaris-sparc-debug	2013-10-11 13:09:36 +0000
@@ -1,7 +1,11 @@
 #!/bin/sh
 
+<<<<<<< TREE
 # Copyright (c) 2001, 2002, 2005-2007 MySQL AB
 # Use is subject to license terms
+=======
+# Copyright (c) 2001, 2002, 2005-2007 MySQL AB
+>>>>>>> MERGE-SOURCE
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'Percona-Server/BUILD/compile-solaris-sparc-purify'
--- Percona-Server/BUILD/compile-solaris-sparc-purify	2013-03-20 16:52:15 +0000
+++ Percona-Server/BUILD/compile-solaris-sparc-purify	2013-10-11 13:09:36 +0000
@@ -1,7 +1,11 @@
 #! /bin/sh
 
+<<<<<<< TREE
 # Copyright (c) 2000-2002, 2005-2007 MySQL AB
 # Use is subject to license terms
+=======
+# Copyright (c) 2000-2002, 2005-2007 MySQL AB
+>>>>>>> MERGE-SOURCE
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== modified file 'Percona-Server/CMakeLists.txt'
--- Percona-Server/CMakeLists.txt	2013-08-02 09:40:55 +0000
+++ Percona-Server/CMakeLists.txt	2013-10-11 13:09:36 +0000
@@ -1,4 +1,8 @@
+<<<<<<< TREE
 # Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+=======
+# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+>>>>>>> MERGE-SOURCE
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 
=== added file 'Percona-Server/Docs/Makefile.am.OTHER'
--- Percona-Server/Docs/Makefile.am.OTHER	1970-01-01 00:00:00 +0000
+++ Percona-Server/Docs/Makefile.am.OTHER	2013-10-11 13:09:36 +0000
@@ -0,0 +1,42 @@
+# Copyright (c) 2000-2008 MySQL AB
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+EXTRA_DIST =		mysql.info INSTALL-BINARY @extra_docs@
+
+# make sure that "make install" installs the info page, too
+# automake only seems to take care of this automatically,
+# if we're building the info page from texi directly.
+install-data-hook:	$(srcdir)/mysql.info
+	if test `basename $(prefix)` = "mysql" ; then \
+	  $(mkinstalldirs) $(DESTDIR)$(prefix)/docs ; \
+	  $(INSTALL_DATA) $(srcdir)/mysql.info $(DESTDIR)$(prefix)/docs ; \
+	  test ! -f $(top_srcdir)/ChangeLog || $(INSTALL_DATA) $(top_srcdir)/ChangeLog $(DESTDIR)$(prefix)/docs ; \
+	else \
+	  $(mkinstalldirs) $(DESTDIR)$(infodir) $(DESTDIR)$(pkgdatadir) ; \
+	  $(INSTALL_DATA) $(srcdir)/mysql.info $(DESTDIR)$(infodir) ; \
+	  test ! -f $(top_srcdir)/ChangeLog || $(INSTALL_DATA) $(top_srcdir)/ChangeLog $(DESTDIR)$(pkgdatadir) ; \
+	fi
+
+uninstall-local:
+	if test `basename $(prefix)` = "mysql" ; then \
+	  @RM@ -f $(DESTDIR)$(prefix)/docs/mysql.info ; \
+	  @RM@ -f $(DESTDIR)$(prefix)/docs/ChangeLog ; \
+	else \
+	  @RM@ -f $(DESTDIR)$(infodir)/mysql.info ; \
+	  @RM@ -f $(DESTDIR)$(pkgdatadir)/ChangeLog ; \
+	fi
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
 
=== modified file 'Percona-Server/INSTALL-SOURCE'
=== modified file 'Percona-Server/INSTALL-WIN-SOURCE'
=== added file 'Percona-Server/Makefile.am.OTHER'
--- Percona-Server/Makefile.am.OTHER	1970-01-01 00:00:00 +0000
+++ Percona-Server/Makefile.am.OTHER	2013-10-11 13:09:36 +0000
@@ -0,0 +1,333 @@
+# Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+# Process this file with automake to create Makefile.in
+
+AUTOMAKE_OPTIONS =	foreign
+
+# These are built from source in the Docs directory
+EXTRA_DIST =		INSTALL-SOURCE INSTALL-WIN-SOURCE \
+			README COPYING CMakeLists.txt
+
+SUBDIRS =		. include @docs_dirs@ @zlib_dir@ \
+			@readline_topdir@ sql-common scripts \
+			@sql_union_dirs@ unittest \
+			@sql_server@ @man_dirs@ tests \
+			netware @libmysqld_dirs@ \
+			mysql-test support-files sql-bench @tools_dirs@ \
+			win
+
+DIST_SUBDIRS =		. include Docs zlib \
+			cmd-line-utils sql-common scripts \
+			strings mysys dbug extra regex libmysql libmysql_r client unittest storage plugin \
+			vio sql man tests \
+			netware libmysqld \
+			mysql-test support-files sql-bench server-tools \
+			win \
+			BUILD
+DISTCLEANFILES = ac_available_languages_fragment
+
+# Create permission databases
+init-db:		all
+	$(top_builddir)/scripts/mysql_install_db
+
+bin-dist:		all
+	$(top_builddir)/scripts/make_binary_distribution @MAKE_BINARY_DISTRIBUTION_OPTIONS@
+
+# Remove BK's "SCCS" subdirectories from source distribution
+# Create initial database files for Windows installations and check them.
+dist-hook:
+	rm -rf `find $(distdir) -type d -name SCCS -print`
+	mkdir -p $(distdir)/win
+	scripts/mysql_install_db --no-defaults --cross-bootstrap \
+		--builddir=$(top_builddir) \
+		--datadir=$(distdir)/win/data \
+		--srcdir=$(top_srcdir)
+	storage/myisam/myisamchk --silent --fast $(distdir)/win/data/mysql/*.MYI
+
+all-local:		@ABI_CHECK@	
+
+tags:
+	support-files/build-tags
+
+.PHONY:	init-db bin-dist \
+  test    test-force    test-full    test-force-full    test-force-mem \
+  test-pl test-force-pl test-full-pl test-force-full-pl test-force-pl-mem \
+  test-unit test-ps test-nr test-pr test-ns test-binlog-statement \
+  test-ext-funcs test-ext-rpl test-ext-partitions test-ext-jp \
+  test-ext-stress test-ext test-embedded test-reprepare \
+  test-fast test-fast-cursor test-fast-view test-fast-prepare \
+  test-full-qa
+
+# Target 'test' will run the regression test suite using the built server.
+#
+# If you are running in a shared environment, users can avoid clashing
+# port numbers by setting individual small numbers 1-100 to the
+# environment variable MTR_BUILD_THREAD. The script "mysql-test-run"
+# will then calculate the various port numbers it needs from this,
+# making sure each user use different ports.
+
+test-unit:
+	cd unittest && $(MAKE) test
+
+test-ps:
+	cd mysql-test ; \
+	    @PERL@ ./mysql-test-run.pl $(force) --ps-protocol --mysqld=--binlog-format=mixed
+
+test-nr:
+	cd mysql-test ; \
+	    @PERL@ ./mysql-test-run.pl $(force) --mysqld=--binlog-format=row
+
+test-pr:
+	cd mysql-test ; \
+	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --ps-protocol --mysqld=--binlog-format=row
+
+test-ns:
+	cd mysql-test ; \
+	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --mysqld=--binlog-format=mixed
+
+test-binlog-statement:
+	cd mysql-test ; \
+	    @PERL@ ./mysql-test-run.pl $(force) --mysqld=--binlog-format=statement
+
+# This code is duplicated in "test-bt", see the Changeset comment of 2007-Dec-07
+test-embedded:
+	if [ -e bin/mysqltest_embedded -o -e libmysqld/examples/mysqltest_embedded ] ; then \
+	  cd mysql-test ; MTR_BUILD_THREAD=auto \
+	      @PERL@ ./mysql-test-run.pl --comment=embedded --force --timer \
+	          --embedded-server --skip-rpl --skip-ndbcluster ; \
+	else \
+	  echo "no program found for 'embedded' tests - skipped testing" ; \
+	fi
+
+test-reprepare:
+	cd mysql-test ; \
+	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --ps-protocol \
+		--mysqld=--debug=+d,reprepare_each_statement
+
+test:	test-unit test-ns test-pr
+
+smoke:
+	cd mysql-test ; \
+	    @PERL@ ./mysql-test-run.pl --do-test=s
+
+test-full:	test test-nr test-ps
+
+test-force:
+	$(MAKE) force=--force test
+
+test-force-full:
+	$(MAKE) force=--force test-full
+
+#used by autopush.pl to run memory based tests
+test-force-mem:
+	$(MAKE) force=--force mem=--mem test
+
+test-bt:
+	-cd mysql-test ; MTR_BUILD_THREAD=auto \
+	    @PERL@ ./mysql-test-run.pl --comment=normal --force --timer \
+	        --skip-ndbcluster --report-features
+	-cd mysql-test ; MTR_BUILD_THREAD=auto \
+	    @PERL@ ./mysql-test-run.pl  --comment=ps    --force --timer \
+	        --skip-ndbcluster --ps-protocol
+	-if [ -e bin/ndbd -o -e storage/ndb/src/kernel/ndbd ] ; then \
+	  cd mysql-test ; \
+	    MTR_BUILD_THREAD=auto \
+	      @PERL@ ./mysql-test-run.pl --comment=ndb+ps --force --timer \
+	          --ps-protocol --mysqld=--binlog-format=row --suite=ndb ; \
+	    MTR_BUILD_THREAD=auto \
+	      @PERL@ ./mysql-test-run.pl --comment=ndb --force --timer \
+	          --with-ndbcluster-only ; \
+	else \
+	  echo "no program found for 'ndbcluster' tests - skipped testing" ; \
+	fi
+	-cd mysql-test ; MTR_BUILD_THREAD=auto \
+	    @PERL@ ./mysql-test-run.pl --force --comment=funcs1+ps --ps-protocol --reorder --suite=funcs_1
+	-cd mysql-test ; MTR_BUILD_THREAD=auto \
+	    @PERL@ ./mysql-test-run.pl --force --comment=funcs2 --suite=funcs_2
+	-cd mysql-test ; MTR_BUILD_THREAD=auto \
+	    @PERL@ ./mysql-test-run.pl --force --comment=partitions --suite=parts
+	-cd mysql-test ; MTR_BUILD_THREAD=auto \
+	    @PERL@ ./mysql-test-run.pl --force --comment=stress --suite=stress
+	-cd mysql-test ; MTR_BUILD_THREAD=auto \
+	    @PERL@ ./mysql-test-run.pl --force --comment=jp --suite=jp
+	-if [ -d mysql-test/suite/nist ] ; then \
+	  cd mysql-test ; MTR_BUILD_THREAD=auto \
+	      @PERL@ ./mysql-test-run.pl --comment=nist --force --suite=nist ; \
+	fi
+	-if [ -d mysql-test/suite/nist ] ; then \
+	  cd mysql-test ; MTR_BUILD_THREAD=auto \
+	      @PERL@ ./mysql-test-run.pl --comment=nist+ps --force --suite=nist --ps-protocol ; \
+	fi
+	-if [ -e bin/mysqltest_embedded -o -e libmysqld/examples/mysqltest_embedded ] ; then \
+	  cd mysql-test ; MTR_BUILD_THREAD=auto \
+	      @PERL@ ./mysql-test-run.pl --comment=embedded --force --timer \
+	          --embedded-server --skip-rpl --skip-ndbcluster ; \
+	else \
+	  echo "no program found for 'embedded' tests - skipped testing" ; \
+	fi
+
+test-bt-fast:
+	-cd mysql-test ; MTR_BUILD_THREAD=auto \
+	    @PERL@ ./mysql-test-run.pl  --comment=ps    --force --timer \
+	        --skip-ndbcluster --ps-protocol --report-features
+	-if [ -e bin/ndbd -o -e storage/ndb/src/kernel/ndbd ] ; then \
+	  cd mysql-test ; \
+	    MTR_BUILD_THREAD=auto \
+	      @PERL@ ./mysql-test-run.pl --comment=ndb --force --timer \
+	          --with-ndbcluster-only ; \
+	else \
+	  echo "no program found for 'ndbcluster' tests - skipped testing" ; \
+	fi
+	-cd mysql-test ; MTR_BUILD_THREAD=auto \
+	    @PERL@ ./mysql-test-run.pl --force --comment=stress --suite=stress
+
+test-bt-debug:
+	-cd mysql-test ; MTR_BUILD_THREAD=auto \
+	    @PERL@ ./mysql-test-run.pl --comment=debug  --force --timer \
+	        --skip-ndbcluster --skip-rpl --report-features
+
+test-bt-debug-fast:
+
+test-bt-debug-fast:
+
+# Keep these for a while
+test-pl:	test
+test-full-pl:	test-full
+test-force-pl:	test-force
+test-force-pl-mem:  test-force-mem
+test-force-full-pl: test-force-full
+
+test-ext-funcs:
+	cd mysql-test ; \
+	    @PERL@ ./mysql-test-run.pl --force --reorder --suite=funcs_1 ; \
+	    @PERL@ ./mysql-test-run.pl --force --suite=funcs_2
+
+test-ext-rpl:
+	cd mysql-test ; \
+	    @PERL@ ./mysql-test-run.pl --force --suite=rpl
+
+test-ext-partitions:
+	cd mysql-test ; \
+	    @PERL@ ./mysql-test-run.pl --force --suite=parts
+
+test-ext-jp:
+	cd mysql-test ; \
+	    @PERL@ ./mysql-test-run.pl --force --suite=jp
+
+test-ext-stress:
+	cd mysql-test ; \
+	    @PERL@ ./mysql-test-run.pl --force --big-test --suite=stress
+
+test-ext:	test-ext-funcs test-ext-rpl test-ext-partitions test-ext-jp test-ext-stress
+
+test-fast:
+	cd mysql-test ; \
+	    @PERL@ ./mysql-test-run.pl $(subset) --force --skip-ndb --skip-innodb --skip-im --skip-rpl ; \
+	    @PERL@ ./mysql-test-run.pl $(subset) --force --suite=funcs_1 --do-test=myisam ; \
+	    @PERL@ ./mysql-test-run.pl $(subset) --force --suite=stress --do-test=ddl_myisam 
+
+test-fast-view:
+	$(MAKE) subset=--view-protocol test-fast
+
+test-fast-cursor:
+	$(MAKE) subset=--cursor-protocol test-fast
+
+test-fast-prepare:
+	$(MAKE) subset=--ps-protocol test-fast
+
+test-full-qa:
+	$(MAKE) force=--force test-pr \
+	    test-binlog-statement test-ext test-fast-view \
+	        test-fast-cursor test-unit
+
+#
+# Headers which need to be checked for abi/api compatibility.
+# API_PREPROCESSOR_HEADER will be used until mysql_priv.h stablizes
+# after which TEST_PREPROCESSOR_HEADER will be used.
+#
+
+API_PREPROCESSOR_HEADER = $(top_srcdir)/include/mysql/plugin.h \
+                           $(top_srcdir)/include/mysql.h
+
+TEST_PREPROCESSOR_HEADER = $(top_srcdir)/include/mysql/plugin.h \
+                            $(top_srcdir)/sql/mysql_priv.h \
+                            $(top_srcdir)/include/mysql.h
+
+#
+# Rules for checking that the abi/api has not changed.
+#
+# The following steps are followed in the do_abi_check rule below
+#
+# 1) Generate preprocessor output for the files that need to
+#    be tested for abi/api changes. use -nostdinc to prevent
+#    generation of preprocessor output for system headers. This
+#    results in messages in stderr saying that these headers
+#    were not found. Redirect the stderr output to /dev/null
+#    to prevent seeing these messages.
+# 2) sed the output to 
+#    2.1) remove blank lines and lines that begin with "# "
+#    2.2) When gcc -E is run on the Mac OS  and solaris sparc platforms it
+#         introduces a line of output that shows up as a difference between
+#         the .pp and .out files. Remove these OS specific preprocessor text
+#         inserted by the preprocessor.
+# 3) diff the generated file and the canons (.pp files already in
+#    the repository).
+# 4) delete the .out file that is generated.
+#
+# If the diff fails, the generated file is not removed. This will
+# be useful for analysis of ABI differences (e.g. using a visual
+# diff tool).
+#
+# A ABI change that causes a build to fail will always be accompanied
+# by new canons (.out files). The .out files that are not removed will
+# be replaced as the new .pp files.
+#
+# e.g. If include/mysql/plugin.h has an ABI change then this rule would
+# leave a <build directory>/abi_check.out file.
+#
+# A developer with a justified API change will then do a
+# mv <build directory>/abi_check.out include/mysql/plugin.pp 
+# to replace the old canons with the new ones.
+#
+
+abi_check:	$(API_PREPROCESSOR_HEADER)
+	$(MAKE) abi_headers="$^" do_abi_check
+
+abi_check_all:	$(TEST_PREPROCESSOR_HEADER)
+	$(MAKE) abi_headers="$^" do_abi_check
+
+do_abi_check:
+	set -ex; \
+	for file in $(abi_headers); do \
+	         @CC@ -E -nostdinc -dI -DMYSQL_ABI_CHECK \
+	                  -I$(top_srcdir)/include \
+	                  -I$(top_srcdir)/include/mysql \
+	                  -I$(top_srcdir)/sql \
+	                  -I$(top_builddir)/include \
+	                  -I$(top_builddir)/include/mysql \
+	                  -I$(top_builddir)/sql \
+	                                 $$file 2>/dev/null | \
+	                  @SED@ -e '/^# /d' \
+	                            -e '/^[ 	]*$$/d' \
+	                            -e '/^#pragma GCC set_debug_pwd/d' \
+	                            -e '/^#ident/d' > \
+	                                       $(top_builddir)/abi_check.out; \
+	                  @DIFF@ -w $$file.pp $(top_builddir)/abi_check.out; \
+	                  @RM@ $(top_builddir)/abi_check.out; \
+	done
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
 
=== modified file 'Percona-Server/README'
--- Percona-Server/README	2013-03-19 04:35:30 +0000
+++ Percona-Server/README	2013-10-11 13:09:36 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 MySQL Server 5.5
 
 This is a release of MySQL, a dual-license SQL database server.
@@ -54,3 +55,61 @@
 in any of several formats at the URL given earlier in this file.
 Source distributions include a local copy of the manual in the
 Docs directory.
+=======
+MySQL Server 5.1
+
+This is a release of MySQL, a dual-license SQL database server.
+For the avoidance of doubt, this particular copy of the software 
+is released under the version 2 of the GNU General Public License. 
+MySQL is brought to you by Oracle.
+
+Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+
+License information can be found in the COPYING file.
+
+MySQL FOSS License Exception
+We want free and open source software applications under certain
+licenses to be able to use specified GPL-licensed MySQL client
+libraries despite the fact that not all such FOSS licenses are
+compatible with version 2 of the GNU General Public License.  
+Therefore there are special exceptions to the terms and conditions 
+of the GPLv2 as applied to these client libraries, which are 
+identified and described in more detail in the FOSS License 
+Exception at 
+<http://www.mysql.com/about/legal/licensing/foss-exception.html>.
+
+This distribution may include materials developed by third
+parties. For license and attribution notices for these
+materials, please refer to the documentation that accompanies
+this distribution (see the "Licenses for Third-Party Components"
+appendix) or view the online documentation at 
+<http://dev.mysql.com/doc/>.
+
+GPLv2 Disclaimer
+For the avoidance of doubt, except that if any license choice
+other than GPL or LGPL is available it will apply instead, 
+Oracle elects to use only the General Public License version 2 
+(GPLv2) at this time for any software where a choice of GPL 
+license versions is made available with the language indicating 
+that GPLv2 or any later version may be used, or where a choice 
+of which version of the GPL is applied is otherwise unspecified.
+
+For further information about MySQL or additional documentation, 
+see:
+- The latest information about MySQL: http://www.mysql.com
+- The current MySQL documentation: http://dev.mysql.com/doc
+
+Some Reference Manual sections of special interest:
+- If you are migrating from an older version of MySQL, please 
+  read the "Upgrading from..." section.
+- To see what MySQL can do, take a look at the features section.
+- For installation instructions, see the Installing and Upgrading
+  chapter.
+- For the new features/bugfix history, see the MySQL Change History 
+  appendix.
+
+You can browse the MySQL Reference Manual online or download it 
+in any of several formats at the URL given earlier in this file.
+Source distributions include a local copy of the manual in the
+Docs directory.
+>>>>>>> MERGE-SOURCE
 
=== modified file 'Percona-Server/client/completion_hash.cc'
--- Percona-Server/client/completion_hash.cc	2013-03-19 12:36:34 +0000
+++ Percona-Server/client/completion_hash.cc	2013-10-11 13:09:36 +0000
@@ -1,4 +1,8 @@
+<<<<<<< TREE
 /* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+=======
+/* Copyright (c) 2000-2002, 2005, 2007 MySQL AB
+>>>>>>> MERGE-SOURCE
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -11,7 +15,11 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
+<<<<<<< TREE
    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
+=======
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
+>>>>>>> MERGE-SOURCE
 
 /* Quick & light hash implementation for tab completion purposes
  *
 
=== modified file 'Percona-Server/client/completion_hash.h'
--- Percona-Server/client/completion_hash.h	2013-03-19 14:53:48 +0000
+++ Percona-Server/client/completion_hash.h	2013-10-11 13:09:36 +0000
@@ -1,5 +1,9 @@
+<<<<<<< TREE
 /* Copyright (c) 2000-2002, 2006 MySQL AB
    Use is subject to license terms
+=======
+/* Copyright (c) 2000-2002, 2006 MySQL AB
+>>>>>>> MERGE-SOURCE
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
 
=== modified file 'Percona-Server/client/echo.c'
--- Percona-Server/client/echo.c	2013-03-19 14:53:48 +0000
+++ Percona-Server/client/echo.c	2013-10-11 13:09:36 +0000
@@ -1,5 +1,9 @@
+<<<<<<< TREE
 /* Copyright (c) 2000, 2007 MySQL AB
    Use is subject to license terms
+=======
+/* Copyright (c) 2000, 2007 MySQL AB
+>>>>>>> MERGE-SOURCE
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'Percona-Server/client/get_password.c'
--- Percona-Server/client/get_password.c	2013-03-19 14:53:48 +0000
+++ Percona-Server/client/get_password.c	2013-10-11 13:09:36 +0000
@@ -1,5 +1,9 @@
+<<<<<<< TREE
 /* Copyright (c) 2000, 2001, 2003, 2006, 2008 MySQL AB
    Use is subject to license terms
+=======
+/* Copyright (c) 2000, 2001, 2003, 2006, 2008 MySQL AB
+>>>>>>> MERGE-SOURCE
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== modified file 'Percona-Server/client/mysql.cc'
=== modified file 'Percona-Server/client/mysqlbinlog.cc'
--- Percona-Server/client/mysqlbinlog.cc	2013-08-02 09:40:55 +0000
+++ Percona-Server/client/mysqlbinlog.cc	2013-10-11 13:09:36 +0000
@@ -943,6 +943,7 @@
     case PRE_GA_DELETE_ROWS_EVENT:
     case PRE_GA_UPDATE_ROWS_EVENT:
     {
+<<<<<<< TREE
       bool stmt_end= FALSE;
       Table_map_log_event *ignored_map= NULL;
 
@@ -978,6 +979,39 @@
       if (stmt_end)
       {
 
+=======
+      bool stmt_end= FALSE;
+      Table_map_log_event *ignored_map= NULL;
+
+      if (ev_type == WRITE_ROWS_EVENT ||
+          ev_type == DELETE_ROWS_EVENT ||
+          ev_type == UPDATE_ROWS_EVENT)
+      {
+        Rows_log_event *new_ev= (Rows_log_event*) ev;
+        if (new_ev->get_flags(Rows_log_event::STMT_END_F))
+          stmt_end= TRUE;
+        ignored_map= print_event_info->m_table_map_ignored.get_table(new_ev->get_table_id());
+      }
+      else if (ev_type == PRE_GA_WRITE_ROWS_EVENT ||
+               ev_type == PRE_GA_DELETE_ROWS_EVENT ||
+               ev_type == PRE_GA_UPDATE_ROWS_EVENT)
+      {
+        Old_rows_log_event *old_ev= (Old_rows_log_event*) ev;
+        if (old_ev->get_flags(Rows_log_event::STMT_END_F))
+          stmt_end= TRUE;
+        ignored_map= print_event_info->m_table_map_ignored.get_table(old_ev->get_table_id());
+      }
+
+      bool skip_event= (ignored_map != NULL);
+      /*
+        end of statement check:
+        i) destroy/free ignored maps
+        ii) if skip event, flush cache now
+       */
+      if (stmt_end)
+      {
+
+>>>>>>> MERGE-SOURCE
           /* 
             Now is safe to clear ignored map (clear_tables will also
             delete original table map events stored in the map).
 
=== modified file 'Percona-Server/client/mysqldump.c'
--- Percona-Server/client/mysqldump.c	2013-08-02 09:40:55 +0000
+++ Percona-Server/client/mysqldump.c	2013-10-11 13:09:36 +0000
@@ -2869,7 +2869,7 @@
   verbose_msg("-- Retrieving table structure for table %s...\n", table);
 
   len= my_snprintf(query_buff, sizeof(query_buff),
-                   "SET OPTION SQL_QUOTE_SHOW_CREATE=%d",
+                   "SET SQL_QUOTE_SHOW_CREATE=%d",
                    (opt_quoted || opt_keywords));
   if (!create_options)
     strmov(query_buff+len,
@@ -3029,6 +3029,7 @@
 
           row= mysql_fetch_row(result);
 
+<<<<<<< TREE
           /*
             The actual column type doesn't matter anyway, since the table will
             be dropped at run time.
@@ -3036,6 +3037,15 @@
           */
           fprintf(sql_file, "  %s tinyint NOT NULL",
                   quote_name(row[0], name_buff, 0));
+=======
+          /*
+            The actual column type doesn't matter anyway, since the table will
+            be dropped at run time.
+            We do tinyint to avoid hitting the row size limit.
+          */
+          fprintf(sql_file, " %s tinyint NOT NULL",
+                  quote_name(row[0], name_buff, 0));
+>>>>>>> MERGE-SOURCE
 
           while((row= mysql_fetch_row(result)))
           {
@@ -5672,7 +5682,7 @@
   verbose_msg("-- Retrieving view structure for table %s...\n", table);
 
 #ifdef NOT_REALLY_USED_YET
-  sprintf(insert_pat,"SET OPTION SQL_QUOTE_SHOW_CREATE=%d",
+  sprintf(insert_pat, "SET SQL_QUOTE_SHOW_CREATE=%d",
           (opt_quoted || opt_keywords));
 #endif
 
 
=== modified file 'Percona-Server/client/sql_string.cc'
=== modified file 'Percona-Server/client/sql_string.h'
--- Percona-Server/client/sql_string.h	2013-06-27 15:35:20 +0000
+++ Percona-Server/client/sql_string.h	2013-10-11 13:09:36 +0000
@@ -1,7 +1,12 @@
+<<<<<<< TREE
 #ifndef CLIENT_SQL_STRING_INCLUDED
 #define CLIENT_SQL_STRING_INCLUDED
 
 /* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+=======
+/*
+   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+>>>>>>> MERGE-SOURCE
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
=== added file 'Percona-Server/cmd-line-utils/Makefile.am.OTHER'
--- Percona-Server/cmd-line-utils/Makefile.am.OTHER	1970-01-01 00:00:00 +0000
+++ Percona-Server/cmd-line-utils/Makefile.am.OTHER	2013-10-11 13:09:36 +0000
@@ -0,0 +1,24 @@
+# Copyright (c) 2003, 2004 MySQL AB
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Library General Public
+# License as published by the Free Software Foundation; version 2
+# of the License.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public
+# License along with this library; if not, write to the Free
+# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# MA 02110-1301, USA
+
+## Process this file with automake to create Makefile.in
+
+SUBDIRS= @readline_basedir@
+DIST_SUBDIRS= libedit readline
+
+# Don't update the files from bitkeeper
+%::SCCS/s.%
 
=== modified file 'Percona-Server/cmd-line-utils/readline/COPYING'
--- Percona-Server/cmd-line-utils/readline/COPYING	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/COPYING	2013-10-11 13:09:36 +0000
@@ -2,7 +2,11 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+<<<<<<< TREE
  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+=======
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+>>>>>>> MERGE-SOURCE
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
 
=== modified file 'Percona-Server/cmd-line-utils/readline/ansi_stdlib.h'
--- Percona-Server/cmd-line-utils/readline/ansi_stdlib.h	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/ansi_stdlib.h	2013-10-11 13:09:36 +0000
@@ -18,7 +18,11 @@
 
    You should have received a copy of the GNU General Public License along
    with Bash; see the file COPYING.  If not, write to the Free Software
+<<<<<<< TREE
    Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 
 #if !defined (_STDLIB_H_)
 #define	_STDLIB_H_ 1
 
=== modified file 'Percona-Server/cmd-line-utils/readline/chardefs.h'
--- Percona-Server/cmd-line-utils/readline/chardefs.h	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/chardefs.h	2013-10-11 13:09:36 +0000
@@ -18,7 +18,11 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
+<<<<<<< TREE
    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 
 #ifndef _CHARDEFS_H_
 #define _CHARDEFS_H_
 
=== modified file 'Percona-Server/cmd-line-utils/readline/complete.c'
--- Percona-Server/cmd-line-utils/readline/complete.c	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/complete.c	2013-10-11 13:09:36 +0000
@@ -18,7 +18,11 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
+<<<<<<< TREE
    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
 
=== modified file 'Percona-Server/cmd-line-utils/readline/configure.in'
--- Percona-Server/cmd-line-utils/readline/configure.in	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/configure.in	2013-10-11 13:09:36 +0000
@@ -19,8 +19,13 @@
 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
+<<<<<<< TREE
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA 02110-1301, USA.
+=======
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, 
+# MA 02110-1301, USA.
+>>>>>>> MERGE-SOURCE
 
 AC_REVISION([for Readline 5.2, version 2.61])
 
 
=== modified file 'Percona-Server/cmd-line-utils/readline/funmap.c'
--- Percona-Server/cmd-line-utils/readline/funmap.c	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/funmap.c	2013-10-11 13:09:36 +0000
@@ -18,7 +18,11 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
+<<<<<<< TREE
    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
 
=== modified file 'Percona-Server/cmd-line-utils/readline/histexpand.c'
--- Percona-Server/cmd-line-utils/readline/histexpand.c	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/histexpand.c	2013-10-11 13:09:36 +0000
@@ -18,7 +18,11 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
+<<<<<<< TREE
    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 
 #define READLINE_LIBRARY
 
 
=== modified file 'Percona-Server/cmd-line-utils/readline/histlib.h'
--- Percona-Server/cmd-line-utils/readline/histlib.h	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/histlib.h	2013-10-11 13:09:36 +0000
@@ -17,7 +17,11 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
+<<<<<<< TREE
    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 
 #if !defined (_HISTLIB_H_)
 #define _HISTLIB_H_
 
=== modified file 'Percona-Server/cmd-line-utils/readline/history.c'
--- Percona-Server/cmd-line-utils/readline/history.c	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/history.c	2013-10-11 13:09:36 +0000
@@ -18,7 +18,11 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
+<<<<<<< TREE
    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 
 /* The goal is to make the implementation transparent, so that you
    don't have to know what data types are used, just what functions
 
=== modified file 'Percona-Server/cmd-line-utils/readline/history.h'
--- Percona-Server/cmd-line-utils/readline/history.h	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/history.h	2013-10-11 13:09:36 +0000
@@ -17,7 +17,11 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
+<<<<<<< TREE
    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 
 #ifndef _HISTORY_H_
 #define _HISTORY_H_
 
=== modified file 'Percona-Server/cmd-line-utils/readline/histsearch.c'
--- Percona-Server/cmd-line-utils/readline/histsearch.c	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/histsearch.c	2013-10-11 13:09:36 +0000
@@ -18,7 +18,11 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
+<<<<<<< TREE
    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 
 #define READLINE_LIBRARY
 
 
=== modified file 'Percona-Server/cmd-line-utils/readline/keymaps.c'
--- Percona-Server/cmd-line-utils/readline/keymaps.c	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/keymaps.c	2013-10-11 13:09:36 +0000
@@ -17,7 +17,11 @@
 
    You should have received a copy of the GNU General Public License
    along with Readline; see the file COPYING.  If not, write to the Free
+<<<<<<< TREE
    Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA */
+>>>>>>> MERGE-SOURCE
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
 
=== modified file 'Percona-Server/cmd-line-utils/readline/keymaps.h'
--- Percona-Server/cmd-line-utils/readline/keymaps.h	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/keymaps.h	2013-10-11 13:09:36 +0000
@@ -18,7 +18,11 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
+<<<<<<< TREE
    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 
 #ifndef _KEYMAPS_H_
 #define _KEYMAPS_H_
 
=== modified file 'Percona-Server/cmd-line-utils/readline/macro.c'
--- Percona-Server/cmd-line-utils/readline/macro.c	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/macro.c	2013-10-11 13:09:36 +0000
@@ -18,7 +18,11 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
+<<<<<<< TREE
    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
 
=== modified file 'Percona-Server/cmd-line-utils/readline/misc.c'
--- Percona-Server/cmd-line-utils/readline/misc.c	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/misc.c	2013-10-11 13:09:36 +0000
@@ -18,7 +18,11 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
+<<<<<<< TREE
    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
 
=== modified file 'Percona-Server/cmd-line-utils/readline/parens.c'
--- Percona-Server/cmd-line-utils/readline/parens.c	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/parens.c	2013-10-11 13:09:36 +0000
@@ -18,7 +18,11 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
+<<<<<<< TREE
    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 #define READLINE_LIBRARY
 
 #if defined (__TANDEM)
 
=== modified file 'Percona-Server/cmd-line-utils/readline/posixdir.h'
--- Percona-Server/cmd-line-utils/readline/posixdir.h	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/posixdir.h	2013-10-11 13:09:36 +0000
@@ -16,7 +16,11 @@
 
    You should have received a copy of the GNU General Public License
    along with Bash; see the file COPYING.  If not, write to the Free
+<<<<<<< TREE
    Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 
 /* This file should be included instead of <dirent.h> or <sys/dir.h>. */
 
 
=== modified file 'Percona-Server/cmd-line-utils/readline/posixjmp.h'
--- Percona-Server/cmd-line-utils/readline/posixjmp.h	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/posixjmp.h	2013-10-11 13:09:36 +0000
@@ -16,7 +16,12 @@
 
    You should have received a copy of the GNU General Public License
    along with Bash; see the file COPYING.  If not, write to the Free
+<<<<<<< TREE
    Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, 
+   MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 
 #ifndef _POSIXJMP_H_
 #define _POSIXJMP_H_
 
=== modified file 'Percona-Server/cmd-line-utils/readline/posixstat.h'
--- Percona-Server/cmd-line-utils/readline/posixstat.h	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/posixstat.h	2013-10-11 13:09:36 +0000
@@ -17,7 +17,12 @@
 
    You should have received a copy of the GNU General Public License
    along with Bash; see the file COPYING.  If not, write to the Free
+<<<<<<< TREE
    Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
+   MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 
 /* This file should be included instead of <sys/stat.h>.
    It relies on the local sys/stat.h to work though. */
 
=== modified file 'Percona-Server/cmd-line-utils/readline/readline.c'
--- Percona-Server/cmd-line-utils/readline/readline.c	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/readline.c	2013-10-11 13:09:36 +0000
@@ -19,7 +19,11 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
+<<<<<<< TREE
    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
 
=== modified file 'Percona-Server/cmd-line-utils/readline/readline.h'
--- Percona-Server/cmd-line-utils/readline/readline.h	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/readline.h	2013-10-11 13:09:36 +0000
@@ -18,7 +18,11 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
+<<<<<<< TREE
    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 
 #if !defined (_READLINE_H_)
 #define _READLINE_H_
 
=== modified file 'Percona-Server/cmd-line-utils/readline/rlconf.h'
--- Percona-Server/cmd-line-utils/readline/rlconf.h	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/rlconf.h	2013-10-11 13:09:36 +0000
@@ -19,7 +19,11 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
+<<<<<<< TREE
    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 
 #if !defined (_RLCONF_H_)
 #define _RLCONF_H_
 
=== modified file 'Percona-Server/cmd-line-utils/readline/rlmbutil.h'
--- Percona-Server/cmd-line-utils/readline/rlmbutil.h	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/rlmbutil.h	2013-10-11 13:09:36 +0000
@@ -18,7 +18,11 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
+<<<<<<< TREE
    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 
 #if !defined (_RL_MBUTIL_H_)
 #define _RL_MBUTIL_H_
 
=== modified file 'Percona-Server/cmd-line-utils/readline/rlstdc.h'
--- Percona-Server/cmd-line-utils/readline/rlstdc.h	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/rlstdc.h	2013-10-11 13:09:36 +0000
@@ -17,7 +17,12 @@
 
    You should have received a copy of the GNU General Public License
    along with Bash; see the file COPYING.  If not, write to the Free
+<<<<<<< TREE
    Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, 
+   MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 
 #if !defined (_RL_STDC_H_)
 #define _RL_STDC_H_
 
=== modified file 'Percona-Server/cmd-line-utils/readline/rltty.c'
--- Percona-Server/cmd-line-utils/readline/rltty.c	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/rltty.c	2013-10-11 13:09:36 +0000
@@ -19,7 +19,11 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
+<<<<<<< TREE
    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
 
=== modified file 'Percona-Server/cmd-line-utils/readline/rltypedefs.h'
--- Percona-Server/cmd-line-utils/readline/rltypedefs.h	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/rltypedefs.h	2013-10-11 13:09:36 +0000
@@ -18,7 +18,11 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
+<<<<<<< TREE
    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 
 #ifndef _RL_TYPEDEFS_H_
 #define _RL_TYPEDEFS_H_
 
=== modified file 'Percona-Server/cmd-line-utils/readline/savestring.c'
--- Percona-Server/cmd-line-utils/readline/savestring.c	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/savestring.c	2013-10-11 13:09:36 +0000
@@ -18,7 +18,11 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
+<<<<<<< TREE
    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 #define READLINE_LIBRARY
 
 #include "config_readline.h"
 
=== modified file 'Percona-Server/cmd-line-utils/readline/search.c'
--- Percona-Server/cmd-line-utils/readline/search.c	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/search.c	2013-10-11 13:09:36 +0000
@@ -19,7 +19,11 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
+<<<<<<< TREE
    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
 
=== modified file 'Percona-Server/cmd-line-utils/readline/shell.c'
--- Percona-Server/cmd-line-utils/readline/shell.c	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/shell.c	2013-10-11 13:09:36 +0000
@@ -19,7 +19,11 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
+<<<<<<< TREE
    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
 
=== modified file 'Percona-Server/cmd-line-utils/readline/text.c'
--- Percona-Server/cmd-line-utils/readline/text.c	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/text.c	2013-10-11 13:09:36 +0000
@@ -18,7 +18,11 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
+<<<<<<< TREE
    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
 
=== modified file 'Percona-Server/cmd-line-utils/readline/tilde.c'
--- Percona-Server/cmd-line-utils/readline/tilde.c	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/tilde.c	2013-10-11 13:09:36 +0000
@@ -17,7 +17,11 @@
 
    You should have received a copy of the GNU General Public License
    along with Readline; see the file COPYING.  If not, write to the Free
+<<<<<<< TREE
    Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 
 #if defined (HAVE_CONFIG_H)
 #  include "config_readline.h"
 
=== modified file 'Percona-Server/cmd-line-utils/readline/tilde.h'
--- Percona-Server/cmd-line-utils/readline/tilde.h	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/tilde.h	2013-10-11 13:09:36 +0000
@@ -19,7 +19,11 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
+<<<<<<< TREE
    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 
 #if !defined (_TILDE_H_)
 #  define _TILDE_H_
 
=== modified file 'Percona-Server/cmd-line-utils/readline/util.c'
--- Percona-Server/cmd-line-utils/readline/util.c	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/util.c	2013-10-11 13:09:36 +0000
@@ -18,7 +18,11 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
+<<<<<<< TREE
    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
 
=== modified file 'Percona-Server/cmd-line-utils/readline/vi_keymap.c'
--- Percona-Server/cmd-line-utils/readline/vi_keymap.c	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/vi_keymap.c	2013-10-11 13:09:36 +0000
@@ -18,7 +18,11 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
+<<<<<<< TREE
    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 
 #if !defined (BUFSIZ)
 #include <stdio.h>
 
=== modified file 'Percona-Server/cmd-line-utils/readline/vi_mode.c'
--- Percona-Server/cmd-line-utils/readline/vi_mode.c	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/vi_mode.c	2013-10-11 13:09:36 +0000
@@ -19,7 +19,11 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
+<<<<<<< TREE
    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 #define READLINE_LIBRARY
 
 /* **************************************************************** */
 
=== modified file 'Percona-Server/cmd-line-utils/readline/xmalloc.c'
--- Percona-Server/cmd-line-utils/readline/xmalloc.c	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/xmalloc.c	2013-10-11 13:09:36 +0000
@@ -17,7 +17,12 @@
 
    You should have received a copy of the GNU General Public License
    along with Readline; see the file COPYING.  If not, write to the Free
+<<<<<<< TREE
    Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, 
+   MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 #define READLINE_LIBRARY
 
 #if defined (HAVE_CONFIG_H)
 
=== modified file 'Percona-Server/cmd-line-utils/readline/xmalloc.h'
--- Percona-Server/cmd-line-utils/readline/xmalloc.h	2013-03-19 14:53:48 +0000
+++ Percona-Server/cmd-line-utils/readline/xmalloc.h	2013-10-11 13:09:36 +0000
@@ -18,7 +18,11 @@
    The GNU General Public License is often shipped with GNU software, and
    is generally kept in a file called COPYING or LICENSE.  If you do not
    have a copy of the license, write to the Free Software Foundation,
+<<<<<<< TREE
    51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. */
+=======
+   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+>>>>>>> MERGE-SOURCE
 
 #if !defined (_XMALLOC_H_)
 #define _XMALLOC_H_
 
=== added directory 'Percona-Server/config'
=== added directory 'Percona-Server/config/ac-macros'
=== added file 'Percona-Server/config/ac-macros/misc.m4.OTHER'
--- Percona-Server/config/ac-macros/misc.m4.OTHER	1970-01-01 00:00:00 +0000
+++ Percona-Server/config/ac-macros/misc.m4.OTHER	2013-10-11 13:09:36 +0000
@@ -0,0 +1,695 @@
+# Local macros for automake & autoconf
+
+#---START: Used in for client configure
+AC_DEFUN([MYSQL_TYPE_ACCEPT],
+[ac_save_CXXFLAGS="$CXXFLAGS"
+AC_CACHE_CHECK([base type of last arg to accept], mysql_cv_btype_last_arg_accept,
+AC_LANG_PUSH(C++)
+if test "$ac_cv_prog_gxx" = "yes"
+then
+  # Add -Werror, remove -fbranch-probabilities (Bug #268)
+  CXXFLAGS=`echo "$CXXFLAGS -Werror" | sed -e 's/-fbranch-probabilities//; s/-Wall//; s/-Wcheck//'`
+fi
+mysql_cv_btype_last_arg_accept=none
+[AC_TRY_COMPILE([#if defined(inline)
+#undef inline
+#endif
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+],
+[int a = accept(1, (struct sockaddr *) 0, (socklen_t *) 0); return (a != 0);],
+mysql_cv_btype_last_arg_accept=socklen_t)]
+if test "$mysql_cv_btype_last_arg_accept" = "none"; then
+[AC_TRY_COMPILE([#if defined(inline)
+#undef inline
+#endif
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+],
+[int a = accept(1, (struct sockaddr *) 0, (size_t *) 0); return (a != 0);],
+mysql_cv_btype_last_arg_accept=size_t)]
+fi
+if test "$mysql_cv_btype_last_arg_accept" = "none"; then
+mysql_cv_btype_last_arg_accept=int
+fi)
+AC_LANG_POP(C++)
+AC_DEFINE_UNQUOTED([SOCKET_SIZE_TYPE], [$mysql_cv_btype_last_arg_accept],
+                   [The base type of the last arg to accept])
+CXXFLAGS="$ac_save_CXXFLAGS"
+])
+#---END:
+
+dnl Find type of qsort
+AC_DEFUN([MYSQL_TYPE_QSORT],
+[AC_CACHE_CHECK([return type of qsort], mysql_cv_type_qsort,
+[AC_TRY_COMPILE([#include <stdlib.h>
+#ifdef __cplusplus
+extern "C"
+#endif
+void qsort(void *base, size_t nel, size_t width,
+ int (*compar) (const void *, const void *));
+],
+[int i;], mysql_cv_type_qsort=void, mysql_cv_type_qsort=int)])
+AC_DEFINE_UNQUOTED([RETQSORTTYPE], [$mysql_cv_type_qsort],
+                   [The return type of qsort (int or void).])
+if test "$mysql_cv_type_qsort" = "void"
+then
+ AC_DEFINE_UNQUOTED([QSORT_TYPE_IS_VOID], [1], [qsort returns void])
+fi
+])
+
+#---START: Figure out whether to use 'struct rlimit' or 'struct rlimit64'
+AC_DEFUN([MYSQL_TYPE_STRUCT_RLIMIT],
+[ac_save_CXXFLAGS="$CXXFLAGS"
+AC_CACHE_CHECK([struct type to use with setrlimit], mysql_cv_btype_struct_rlimit,
+AC_LANG_PUSH(C++)
+if test "$ac_cv_prog_gxx" = "yes"
+then
+  # Add -Werror, remove -fbranch-probabilities (Bug #268)
+  CXXFLAGS=`echo "$CXXFLAGS -Werror" | sed -e 's/-fbranch-probabilities//; s/-Wall//; s/-Wcheck//'`
+fi
+mysql_cv_btype_struct_rlimit=none
+[AC_TRY_COMPILE([#if defined(inline)
+#undef inline
+#endif
+#include <stdlib.h>
+#include <sys/resource.h>
+],
+[struct rlimit64 rl; setrlimit(RLIMIT_CORE, &rl);],
+mysql_cv_btype_struct_rlimit="struct rlimit64")]
+if test "$mysql_cv_btype_struct_rlimit" = "none"; then
+mysql_cv_btype_struct_rlimit="struct rlimit"
+fi)
+AC_LANG_POP(C++)
+AC_DEFINE_UNQUOTED([STRUCT_RLIMIT], [$mysql_cv_btype_struct_rlimit],
+                   [The struct rlimit type to use with setrlimit])
+CXXFLAGS="$ac_save_CXXFLAGS"
+])
+#---END:
+
+AC_DEFUN([MYSQL_TIMESPEC_TS],
+[AC_CACHE_CHECK([if struct timespec has a ts_sec member], mysql_cv_timespec_ts,
+[AC_TRY_COMPILE([#include <pthread.h>
+#ifdef __cplusplus
+extern "C"
+#endif
+],
+[struct timespec abstime;
+
+abstime.ts_sec = time(NULL)+1;
+abstime.ts_nsec = 0;
+], mysql_cv_timespec_ts=yes, mysql_cv_timespec_ts=no)])
+if test "$mysql_cv_timespec_ts" = "yes"
+then
+  AC_DEFINE([HAVE_TIMESPEC_TS_SEC], [1],
+            [Timespec has a ts_sec instead of tv_sev])
+fi
+])
+
+AC_DEFUN([MYSQL_TZNAME],
+[AC_CACHE_CHECK([if we have tzname variable], mysql_cv_tzname,
+[AC_TRY_COMPILE([#include <time.h>
+#ifdef __cplusplus
+extern "C"
+#endif
+],
+[ tzset();
+  return tzname[0] != 0;
+], mysql_cv_tzname=yes, mysql_cv_tzname=no)])
+if test "$mysql_cv_tzname" = "yes"
+then
+  AC_DEFINE([HAVE_TZNAME], [1], [Have the tzname variable])
+fi
+])
+
+
+AC_DEFUN([MYSQL_PTHREAD_YIELD],
+[AC_CACHE_CHECK([if pthread_yield takes zero arguments], ac_cv_pthread_yield_zero_arg,
+[AC_TRY_LINK([#define _GNU_SOURCE
+#include <pthread.h>
+#ifdef __cplusplus
+extern "C"
+#endif
+],
+[
+  pthread_yield();
+], ac_cv_pthread_yield_zero_arg=yes, ac_cv_pthread_yield_zero_arg=yeso)])
+if test "$ac_cv_pthread_yield_zero_arg" = "yes"
+then
+  AC_DEFINE([HAVE_PTHREAD_YIELD_ZERO_ARG], [1],
+            [pthread_yield that doesn't take any arguments])
+fi
+]
+[AC_CACHE_CHECK([if pthread_yield takes 1 argument], ac_cv_pthread_yield_one_arg,
+[AC_TRY_LINK([#define _GNU_SOURCE
+#include <pthread.h>
+#ifdef __cplusplus
+extern "C"
+#endif
+],
+[
+  pthread_yield(0);
+], ac_cv_pthread_yield_one_arg=yes, ac_cv_pthread_yield_one_arg=no)])
+if test "$ac_cv_pthread_yield_one_arg" = "yes"
+then
+  AC_DEFINE([HAVE_PTHREAD_YIELD_ONE_ARG], [1],
+            [pthread_yield function with one argument])
+fi
+]
+)
+
+
+
+#---END:
+
+# From fileutils-3.14/aclocal.m4
+
+# @defmac AC_PROG_CC_STDC
+# @maindex PROG_CC_STDC
+# @ovindex CC
+# If the C compiler in not in ANSI C mode by default, try to add an option
+# to output variable @code{CC} to make it so.  This macro tries various
+# options that select ANSI C on some system or another.  It considers the
+# compiler to be in ANSI C mode if it defines @code{__STDC__} to 1 and
+# handles function prototypes correctly.
+#
+# Patched by monty to only check if __STDC__ is defined. With the original 
+# check it's impossible to get things to work with the Sunpro compiler from
+# Workshop 4.2
+#
+# If you use this macro, you should check after calling it whether the C
+# compiler has been set to accept ANSI C; if not, the shell variable
+# @code{am_cv_prog_cc_stdc} is set to @samp{no}.  If you wrote your source
+# code in ANSI C, you can make an un-ANSIfied copy of it by using the
+# program @code{ansi2knr}, which comes with Ghostscript.
+# @end defmac
+
+AC_DEFUN([AM_PROG_CC_STDC],
+[AC_REQUIRE([AC_PROG_CC])
+AC_MSG_CHECKING(for ${CC-cc} option to accept ANSI C)
+AC_CACHE_VAL(am_cv_prog_cc_stdc,
+[am_cv_prog_cc_stdc=no
+ac_save_CC="$CC"
+# Don't try gcc -ansi; that turns off useful extensions and
+# breaks some systems' header files.
+# AIX			-qlanglvl=ansi
+# Ultrix and OSF/1	-std1
+# HP-UX			-Aa -D_HPUX_SOURCE
+# SVR4			-Xc -D__EXTENSIONS__
+# removed "-Xc -D__EXTENSIONS__" beacause sun c++ does not like it.
+for ac_arg in "" -qlanglvl=ansi -std1 "-Aa -D_HPUX_SOURCE" 
+do
+  CC="$ac_save_CC $ac_arg"
+  AC_TRY_COMPILE(
+[#if !defined(__STDC__)
+choke me
+#endif
+/* DYNIX/ptx V4.1.3 can't compile sys/stat.h with -Xc -D__EXTENSIONS__. */
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/stat.h>
+#endif
+], [
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};],
+[am_cv_prog_cc_stdc="$ac_arg"; break])
+done
+CC="$ac_save_CC"
+])
+AC_MSG_RESULT($am_cv_prog_cc_stdc)
+case "x$am_cv_prog_cc_stdc" in
+  x|xno) ;;
+  *) CC="$CC $am_cv_prog_cc_stdc" ;;
+esac
+])
+
+# Orginal from bash-2.0 aclocal.m4, Changed to use termcap last by monty.
+ 
+AC_DEFUN([MYSQL_CHECK_LIB_TERMCAP],
+[
+AC_CACHE_VAL(mysql_cv_termcap_lib,
+    [AC_CHECK_LIB(ncursesw, tgetent, mysql_cv_termcap_lib=libncursesw,
+        [AC_CHECK_LIB(ncurses, tgetent, mysql_cv_termcap_lib=libncurses,
+            [AC_CHECK_LIB(curses, tgetent, mysql_cv_termcap_lib=libcurses,
+                [AC_CHECK_LIB(termcap, tgetent, mysql_cv_termcap_lib=libtermcap,
+                    [AC_CHECK_LIB(tinfo, tgetent, mysql_cv_termcap_lib=libtinfo,
+                        mysql_cv_termcap_lib=NOT_FOUND)])])])])])
+AC_MSG_CHECKING(for termcap functions library)
+if test "$mysql_cv_termcap_lib" = "NOT_FOUND"; then
+AC_MSG_ERROR([No curses/termcap library found])
+elif test "$mysql_cv_termcap_lib" = "libtermcap"; then
+TERMCAP_LIB=-ltermcap
+elif test "$mysql_cv_termcap_lib" = "libncursesw"; then
+TERMCAP_LIB=-lncursesw
+elif test "$mysql_cv_termcap_lib" = "libncurses"; then
+TERMCAP_LIB=-lncurses
+elif test "$mysql_cv_termcap_lib" = "libtinfo"; then
+TERMCAP_LIB=-ltinfo
+else
+TERMCAP_LIB=-lcurses
+fi
+AC_MSG_RESULT($TERMCAP_LIB)
+])
+
+dnl Check type of signal routines (posix, 4.2bsd, 4.1bsd or v7)
+AC_DEFUN([MYSQL_SIGNAL_CHECK],
+[AC_REQUIRE([AC_TYPE_SIGNAL])
+AC_MSG_CHECKING(for type of signal functions)
+AC_CACHE_VAL(mysql_cv_signal_vintage,
+[
+  AC_TRY_LINK([#include <signal.h>],[
+    sigset_t ss;
+    struct sigaction sa;
+    sigemptyset(&ss); sigsuspend(&ss);
+    sigaction(SIGINT, &sa, (struct sigaction *) 0);
+    sigprocmask(SIG_BLOCK, &ss, (sigset_t *) 0);
+  ], mysql_cv_signal_vintage=posix,
+  [
+    AC_TRY_LINK([#include <signal.h>], [
+	int mask = sigmask(SIGINT);
+	sigsetmask(mask); sigblock(mask); sigpause(mask);
+    ], mysql_cv_signal_vintage=4.2bsd,
+    [
+      AC_TRY_LINK([
+	#include <signal.h>
+	RETSIGTYPE foo() { }], [
+		int mask = sigmask(SIGINT);
+		sigset(SIGINT, foo); sigrelse(SIGINT);
+		sighold(SIGINT); sigpause(SIGINT);
+        ], mysql_cv_signal_vintage=svr3, mysql_cv_signal_vintage=v7
+    )]
+  )]
+)
+])
+AC_MSG_RESULT($mysql_cv_signal_vintage)
+if test "$mysql_cv_signal_vintage" = posix; then
+AC_DEFINE(HAVE_POSIX_SIGNALS, [1],
+          [Signal handling is POSIX (sigset/sighold, etc)])
+elif test "$mysql_cv_signal_vintage" = "4.2bsd"; then
+AC_DEFINE([HAVE_BSD_SIGNALS], [1], [BSD style signals])
+elif test "$mysql_cv_signal_vintage" = svr3; then
+AC_DEFINE(HAVE_USG_SIGHOLD, [1], [sighold() is present and usable])
+fi
+])
+
+AC_DEFUN([MYSQL_CHECK_GETPW_FUNCS],
+[AC_MSG_CHECKING(whether programs are able to redeclare getpw functions)
+AC_CACHE_VAL(mysql_cv_can_redecl_getpw,
+[AC_TRY_COMPILE([#include <sys/types.h>
+#include <pwd.h>
+extern struct passwd *getpwent();], [struct passwd *z; z = getpwent();],
+  mysql_cv_can_redecl_getpw=yes,mysql_cv_can_redecl_getpw=no)])
+AC_MSG_RESULT($mysql_cv_can_redecl_getpw)
+if test "$mysql_cv_can_redecl_getpw" = "no"; then
+AC_DEFINE(HAVE_GETPW_DECLS, [1], [getpwent() declaration present])
+fi
+])
+
+AC_DEFUN([MYSQL_HAVE_TIOCGWINSZ],
+[AC_MSG_CHECKING(for TIOCGWINSZ in sys/ioctl.h)
+AC_CACHE_VAL(mysql_cv_tiocgwinsz_in_ioctl,
+[AC_TRY_COMPILE([#include <sys/types.h>
+#include <sys/ioctl.h>], [int x = TIOCGWINSZ;],
+  mysql_cv_tiocgwinsz_in_ioctl=yes,mysql_cv_tiocgwinsz_in_ioctl=no)])
+AC_MSG_RESULT($mysql_cv_tiocgwinsz_in_ioctl)
+if test "$mysql_cv_tiocgwinsz_in_ioctl" = "yes"; then   
+AC_DEFINE([GWINSZ_IN_SYS_IOCTL], [1],
+          [READLINE: your system defines TIOCGWINSZ in sys/ioctl.h.])
+fi
+])
+
+AC_DEFUN([MYSQL_HAVE_FIONREAD],
+[AC_MSG_CHECKING(for FIONREAD in sys/ioctl.h)
+AC_CACHE_VAL(mysql_cv_fionread_in_ioctl,
+[AC_TRY_COMPILE([#include <sys/types.h>
+#include <sys/ioctl.h>], [int x = FIONREAD;],
+  mysql_cv_fionread_in_ioctl=yes,mysql_cv_fionread_in_ioctl=no)])
+AC_MSG_RESULT($mysql_cv_fionread_in_ioctl)
+if test "$mysql_cv_fionread_in_ioctl" = "yes"; then   
+AC_DEFINE([FIONREAD_IN_SYS_IOCTL], [1], [Do we have FIONREAD])
+fi
+])
+
+AC_DEFUN([MYSQL_HAVE_TIOCSTAT],
+[AC_MSG_CHECKING(for TIOCSTAT in sys/ioctl.h)
+AC_CACHE_VAL(mysql_cv_tiocstat_in_ioctl,
+[AC_TRY_COMPILE([#include <sys/types.h>
+#include <sys/ioctl.h>], [int x = TIOCSTAT;],
+  mysql_cv_tiocstat_in_ioctl=yes,mysql_cv_tiocstat_in_ioctl=no)])
+AC_MSG_RESULT($mysql_cv_tiocstat_in_ioctl)
+if test "$mysql_cv_tiocstat_in_ioctl" = "yes"; then   
+AC_DEFINE(TIOCSTAT_IN_SYS_IOCTL, [1],
+          [declaration of TIOCSTAT in sys/ioctl.h])
+fi
+])
+
+AC_DEFUN([MYSQL_STRUCT_DIRENT_D_INO],
+[AC_REQUIRE([AC_HEADER_DIRENT])
+AC_MSG_CHECKING(if struct dirent has a d_ino member)
+AC_CACHE_VAL(mysql_cv_dirent_has_dino,
+[AC_TRY_COMPILE([
+#include <stdio.h>
+#include <sys/types.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif /* HAVE_UNISTD_H */
+#if defined(HAVE_DIRENT_H)
+# include <dirent.h>
+#else
+# define dirent direct
+# ifdef HAVE_SYS_NDIR_H
+#  include <sys/ndir.h>
+# endif /* SYSNDIR */
+# ifdef HAVE_SYS_DIR_H
+#  include <sys/dir.h>
+# endif /* SYSDIR */
+# ifdef HAVE_NDIR_H
+#  include <ndir.h>
+# endif
+#endif /* HAVE_DIRENT_H */
+],[
+struct dirent d; int z; z = d.d_ino;
+], mysql_cv_dirent_has_dino=yes, mysql_cv_dirent_has_dino=no)])
+AC_MSG_RESULT($mysql_cv_dirent_has_dino)
+if test "$mysql_cv_dirent_has_dino" = "yes"; then
+AC_DEFINE(STRUCT_DIRENT_HAS_D_INO, [1],
+          [d_ino member present in struct dirent])
+fi
+])
+
+AC_DEFUN([MYSQL_STRUCT_DIRENT_D_NAMLEN],
+[AC_REQUIRE([AC_HEADER_DIRENT])
+AC_MSG_CHECKING(if struct dirent has a d_namlen member)
+AC_CACHE_VAL(mysql_cv_dirent_has_dnamlen,
+[AC_TRY_COMPILE([
+#include <stdio.h>
+#include <sys/types.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif /* HAVE_UNISTD_H */
+#if defined(HAVE_DIRENT_H)
+# include <dirent.h>
+#else
+# define dirent direct
+# ifdef HAVE_SYS_NDIR_H
+#  include <sys/ndir.h>
+# endif /* SYSNDIR */
+# ifdef HAVE_SYS_DIR_H
+#  include <sys/dir.h>
+# endif /* SYSDIR */
+# ifdef HAVE_NDIR_H
+#  include <ndir.h>
+# endif
+#endif /* HAVE_DIRENT_H */
+],[
+struct dirent d; int z; z = (int)d.d_namlen;
+], mysql_cv_dirent_has_dnamlen=yes, mysql_cv_dirent_has_dnamlen=no)])
+AC_MSG_RESULT($mysql_cv_dirent_has_dnamlen)
+if test "$mysql_cv_dirent_has_dnamlen" = "yes"; then
+AC_DEFINE(STRUCT_DIRENT_HAS_D_NAMLEN, [1],
+          [d_namlen member present in struct dirent])
+fi
+])
+
+
+AC_DEFUN([MYSQL_TYPE_SIGHANDLER],
+[AC_MSG_CHECKING([whether signal handlers are of type void])
+AC_CACHE_VAL(mysql_cv_void_sighandler,
+[AC_TRY_COMPILE([#include <sys/types.h>
+#include <signal.h>
+#ifdef signal
+#undef signal
+#endif
+#ifdef __cplusplus
+extern "C"
+#endif
+void (*signal ()) ();],
+[int i;], mysql_cv_void_sighandler=yes, mysql_cv_void_sighandler=no)])dnl
+AC_MSG_RESULT($mysql_cv_void_sighandler)
+if test "$mysql_cv_void_sighandler" = "yes"; then
+AC_DEFINE(VOID_SIGHANDLER, [1], [sighandler type is void (*signal ()) ();])
+fi
+])
+
+AC_DEFUN([MYSQL_CXX_BOOL],
+[
+AC_REQUIRE([AC_PROG_CXX])
+AC_MSG_CHECKING(if ${CXX} supports bool types)
+AC_CACHE_VAL(mysql_cv_have_bool,
+[
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+AC_TRY_COMPILE(,[bool b = true;],
+mysql_cv_have_bool=yes,
+mysql_cv_have_bool=no)
+AC_LANG_RESTORE
+])
+AC_MSG_RESULT($mysql_cv_have_bool)
+if test "$mysql_cv_have_bool" = yes; then
+AC_DEFINE([HAVE_BOOL], [1], [bool is not defined by all C++ compilators])
+fi
+])dnl
+
+AC_DEFUN([MYSQL_STACK_DIRECTION],
+ [AC_CACHE_CHECK(stack direction for C alloca, ac_cv_c_stack_direction,
+ [AC_TRY_RUN([#include <stdlib.h>
+ /* Prevent compiler optimization by HP's compiler, see bug#42213 */
+#if defined(__HP_cc) || defined (__HP_aCC) || defined (__hpux)
+#pragma noinline
+#endif
+  /* Check stack direction (-1 down, 1 up) */
+  int f(int *a)
+  {
+    int b;
+    return(&b > a)?1:-1;
+  }
+  /*
+   Prevent compiler optimizations by calling function 
+   through pointer.
+  */
+  volatile int (*ptr_f)(int *) = f;
+  int main()
+  {
+    int a;
+    exit(ptr_f(&a) < 0);
+  }
+  ], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1,
+   ac_cv_c_stack_direction=)])
+ AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction)
+])dnl
+
+AC_DEFUN([MYSQL_CHECK_LONGLONG_TO_FLOAT],
+[
+AC_MSG_CHECKING(if conversion of longlong to float works)
+AC_CACHE_VAL(ac_cv_conv_longlong_to_float,
+[AC_TRY_RUN([#include <stdio.h>
+typedef long long longlong;
+int main()
+{
+  longlong ll=1;
+  float f;
+  FILE *file=fopen("conftestval", "w");
+  f = (float) ll;
+  fprintf(file,"%g\n",f);
+  fclose(file);
+  return (0);
+}], ac_cv_conv_longlong_to_float=`cat conftestval`,
+    ac_cv_conv_longlong_to_float=0,
+    ac_cv_conv_longlong_to_float="yes")])dnl  # Cross compiling, assume can convert
+if test "$ac_cv_conv_longlong_to_float" = "1" -o "$ac_cv_conv_longlong_to_float" = "yes"
+then
+  ac_cv_conv_longlong_to_float=yes
+else
+  ac_cv_conv_longlong_to_float=no
+fi
+AC_MSG_RESULT($ac_cv_conv_longlong_to_float)
+])
+
+AC_DEFUN([MYSQL_CHECK_VIO], [
+dnl
+dnl we always use vio: no need for special defines 
+dnl
+  AC_DEFINE([HAVE_VIO_READ_BUFF], [1],
+            [Define to enable buffered read. This works only if syscalls
+            read/recv return as soon as there is some data in the kernel
+            buffer, no matter how big the given buffer is.])
+])
+
+# Local version of _AC_PROG_CXX_EXIT_DECLARATION that does not
+# include #stdlib.h as default as this breaks things on Solaris
+# (Conflicts with pthreads and big file handling)
+
+m4_define([_AC_PROG_CXX_EXIT_DECLARATION],
+[for ac_declaration in \
+   ''\
+   'extern "C" void std::exit (int) throw (); using std::exit;' \
+   'extern "C" void std::exit (int); using std::exit;' \
+   'extern "C" void exit (int) throw ();' \
+   'extern "C" void exit (int);' \
+   'void exit (int);' \
+   '#include <stdlib.h>'
+do
+  _AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$ac_declaration
+@%:@include <stdlib.h>],
+                                      [exit (42);])],
+                     [],
+                     [continue])
+  _AC_COMPILE_IFELSE([AC_LANG_PROGRAM([$ac_declaration],
+                                      [exit (42);])],
+                     [break])
+done
+rm -f conftest*
+if test -n "$ac_declaration"; then
+  echo '#ifdef __cplusplus' >>confdefs.h
+  echo $ac_declaration      >>confdefs.h
+  echo '#endif'             >>confdefs.h
+fi
+])# _AC_PROG_CXX_EXIT_DECLARATION
+
+dnl ---------------------------------------------------------------------------
+
+
+dnl ---------------------------------------------------------------------------
+dnl Macro: MYSQL_CHECK_BIG_TABLES
+dnl Sets BIG_TABLES if --with-big-tables is used
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([MYSQL_CHECK_BIG_TABLES], [
+  AC_ARG_WITH([big-tables],
+  AS_HELP_STRING([--with-big-tables],
+              [Support tables with more than 4 G rows even on 32 bit platforms]),
+              [bigtables="$withval"],
+              [bigtables=no])
+  AC_MSG_CHECKING([for big tables support])
+
+  case "$bigtables" in
+    yes )
+      AC_DEFINE([BIG_TABLES], [1], [Support big tables])
+      AC_MSG_RESULT([yes])
+      ;;
+    * )
+      AC_MSG_RESULT([no])
+      ;;
+  esac
+
+])
+dnl ---------------------------------------------------------------------------
+dnl END OF MYSQL_CHECK_BIG_TABLES SECTION
+dnl ---------------------------------------------------------------------------
+
+
+dnl ---------------------------------------------------------------------------
+dnl Macro: MYSQL_CHECK_MAX_INDEXES
+dnl Sets MAX_INDEXES
+dnl ---------------------------------------------------------------------------
+AC_DEFUN([MYSQL_CHECK_MAX_INDEXES], [
+  AC_ARG_WITH([max-indexes],
+              AS_HELP_STRING([--with-max-indexes=N],
+                             [Sets the maximum number of indexes per table, default 64]),
+              [max_indexes="$withval"],
+              [max_indexes=64])
+  AC_MSG_CHECKING([max indexes per table])
+  AC_DEFINE_UNQUOTED([MAX_INDEXES], [$max_indexes],
+                     [Maximum number of indexes per table])
+  AC_MSG_RESULT([$max_indexes])
+])
+dnl ---------------------------------------------------------------------------
+dnl END OF MYSQL_CHECK_MAX_INDEXES SECTION
+dnl ---------------------------------------------------------------------------
+
+
+dnl MYSQL_NEEDS_MYSYS_NEW
+AC_DEFUN([MYSQL_NEEDS_MYSYS_NEW],
+[AC_CACHE_CHECK([needs mysys_new helpers], mysql_cv_use_mysys_new,
+[
+AC_LANG_PUSH(C++)
+AC_TRY_LINK([], [
+class A { public: int b; }; A *a=new A; a->b=10; delete a;
+], mysql_cv_use_mysys_new=no, mysql_cv_use_mysys_new=yes)
+AC_LANG_POP(C++)
+])
+if test "$mysql_cv_use_mysys_new" = "yes"
+then
+  AC_DEFINE([USE_MYSYS_NEW], [1], [Needs to use mysys_new helpers])
+fi
+])
+
+
+AC_DEFUN([MYSQL_CHECK_CXX_VERSION], [
+case $SYSTEM_TYPE in
+  *netware*)
+    CXX_VERSION=`$CXX -version | grep -i version`
+  ;;
+  *)
+    CXX_VERSION=`$CXX --version | sed 1q`
+    if test $? -ne "0" -o -z "$CXX_VERSION"
+    then
+      CXX_VERSION=`$CXX -V 2>&1|sed 1q` # trying harder for Sun and SGI
+    fi
+    if test $? -ne "0" -o -z "$CXX_VERSION"
+    then
+      CXX_VERSION=`$CXX -v 2>&1|sed 1q` # even harder for Alpha
+    fi
+    if test $? -ne "0" -o -z "$CXX_VERSION"
+    then
+      CXX_VERSION=""
+    fi
+esac
+if test "$CXX_VERSION"
+then
+  AC_MSG_CHECKING("C++ compiler version")
+  AC_MSG_RESULT("$CXX $CXX_VERSION")
+fi
+AC_SUBST(CXX_VERSION)
+])
+
+AC_DEFUN([MYSQL_PROG_AR], [
+case $CXX_VERSION in
+  MIPSpro*)
+    AR=$CXX
+    ARFLAGS="-ar -o"
+  ;;
+  *Forte*)
+    AR=$CXX
+    ARFLAGS="-xar -o"
+  ;;
+  *)
+    AC_CHECK_PROG([AR], [ar], [ar])
+    if test -z "$AR" || test "$AR" = "false"
+    then
+      AC_MSG_ERROR([You need ar to build the library])
+    fi
+    if test -z "$ARFLAGS"
+    then
+      ARFLAGS="cru"
+    fi
+esac
+AC_SUBST(AR)
+AC_SUBST(ARFLAGS)
+])
+
+dnl
+dnl  Macro to check time_t range: according to C standard
+dnl  array index must be greater than 0 => if time_t is signed,
+dnl  the code in the macros below won't compile.
+dnl
+
+AC_DEFUN([MYSQL_CHECK_TIME_T],[
+    AC_MSG_CHECKING(if time_t is unsigned)
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+        [[
+#include <time.h>
+        ]],
+        [[
+        int array[(((time_t)-1) > 0) ? 1 : -1];
+        ]] )
+    ], [
+    AC_DEFINE([TIME_T_UNSIGNED], 1, [Define to 1 if time_t is unsigned])
+    AC_MSG_RESULT(yes)
+    ],
+    [AC_MSG_RESULT(no)]
+    )
+])
+
 
=== added file 'Percona-Server/configure.in.OTHER'
--- Percona-Server/configure.in.OTHER	1970-01-01 00:00:00 +0000
+++ Percona-Server/configure.in.OTHER	2013-10-11 13:09:36 +0000
@@ -0,0 +1,2981 @@
+dnl -*- ksh -*-
+dnl Process this file with autoconf to produce a configure script.
+
+# Minimum Autoconf version required.
+AC_PREREQ(2.59)
+
+dnl Various people throughout the community may parse configure.in to
+dnl get the MySQL version from the source branch.  If the formatting
+dnl of this line is going to be changed, please announce the change to
+dnl [e-mail] in advance of pushing the change.
+dnl
+dnl When changing the major version number please also check the switch
+dnl statement in mysqlbinlog::check_master_version().  You may also need
+dnl to update version.c in ndb.
+AC_INIT([MySQL Server], [5.1.72], [], [mysql])
+
+AC_CONFIG_SRCDIR([sql/mysqld.cc])
+AC_CANONICAL_SYSTEM
+# USTAR format gives us the possibility to store longer path names in
+# TAR files, the path name is split into two parts, a 155 chacater
+# first part and a 100 character second part.
+AM_INIT_AUTOMAKE([1.9 tar-ustar])
+AC_PROG_LIBTOOL
+
+AC_CONFIG_HEADERS([include/config.h])
+
+# Request support for automake silent-rules if available.
+# Default to verbose output. One can use the configure-time
+# option --enable-silent-rules or make V=0 to activate
+# silent rules.
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([no])])
+
+PROTOCOL_VERSION=10
+DOT_FRM_VERSION=6
+# See the libtool docs for information on how to do shared lib versions.
+SHARED_LIB_MAJOR_VERSION=16
+SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0
+NDB_SHARED_LIB_MAJOR_VERSION=3
+NDB_SHARED_LIB_VERSION=$NDB_SHARED_LIB_MAJOR_VERSION:0:0
+
+# Set all version vars based on $VERSION. How do we do this more elegant ?
+# Remember that regexps needs to quote [ and ] since this is run through m4
+# We take some made up examples
+#
+#  VERSION                  5.1.40sp1-alpha     5.0.34a  5.5.1-m2
+#  MYSQL_U_SCORE_VERSION    5.1.40sp1_alpha     5.0.34a  5.5.1_m2
+#  MYSQL_NO_DASH_VERSION    5.1.40sp1           5.0.34a  5.5.1
+#  MYSQL_NUMERIC_VERSION    5.1.40              5.0.34   5.5.1
+#  MYSQL_BASE_VERSION       5.1                 5.0      5.5
+#  MYSQL_VERSION_ID         50140               50034    50501
+#
+MYSQL_U_SCORE_VERSION=`echo $VERSION | sed -e "s|-|_|"`
+MYSQL_NO_DASH_VERSION=`echo $VERSION | sed -e "s|-.*$||"`
+MYSQL_NUMERIC_VERSION=`echo $MYSQL_NO_DASH_VERSION | sed -e "s|[[a-z]][[a-z0-9]]*$||"`
+MYSQL_BASE_VERSION=`echo $MYSQL_NUMERIC_VERSION | sed -e "s|\.[[^.]]*$||"`
+MYSQL_VERSION_ID=`echo $MYSQL_NUMERIC_VERSION | \
+    awk -F. '{printf "%d%0.2d%0.2d", $1, $2, $3}'`
+MYSQL_COPYRIGHT_YEAR=`date '+%Y'`
+
+# Add previous major version for debian package upgrade path
+MYSQL_PREVIOUS_BASE_VERSION=5.0
+
+# The port should be constant for a LONG time
+MYSQL_TCP_PORT_DEFAULT=3306
+MYSQL_UNIX_ADDR_DEFAULT="/tmp/mysql.sock"
+
+dnl Include m4 
+sinclude(config/ac-macros/maintainer.m4)
+sinclude(config/ac-macros/alloca.m4)
+sinclude(config/ac-macros/check_cpu.m4)
+sinclude(config/ac-macros/character_sets.m4)
+sinclude(config/ac-macros/compiler_flag.m4)
+sinclude(config/ac-macros/plugins.m4)
+sinclude(config/ac-macros/ha_ndbcluster.m4)
+sinclude(config/ac-macros/large_file.m4)
+sinclude(config/ac-macros/misc.m4)
+sinclude(config/ac-macros/readline.m4)
+sinclude(config/ac-macros/ssl.m4)
+sinclude(config/ac-macros/zlib.m4)
+
+# Remember to add a directory sql/share/LANGUAGE
+AVAILABLE_LANGUAGES="\
+czech danish dutch english estonian french german greek hungarian \
+italian japanese korean norwegian norwegian-ny polish portuguese \
+romanian russian serbian slovak spanish swedish ukrainian"
+
+#####
+#####
+
+AC_SUBST(MYSQL_U_SCORE_VERSION)
+AC_SUBST(MYSQL_NO_DASH_VERSION)
+AC_SUBST(MYSQL_BASE_VERSION)
+AC_SUBST(MYSQL_VERSION_ID)
+AC_SUBST(MYSQL_PREVIOUS_BASE_VERSION)
+AC_SUBST(MYSQL_COPYRIGHT_YEAR)
+AC_SUBST(PROTOCOL_VERSION)
+AC_DEFINE_UNQUOTED([PROTOCOL_VERSION], [$PROTOCOL_VERSION],
+                   [mysql client protocol version])
+AC_SUBST(DOT_FRM_VERSION)
+AC_DEFINE_UNQUOTED([DOT_FRM_VERSION], [$DOT_FRM_VERSION],
+                   [Version of .frm files])
+AC_SUBST(SHARED_LIB_MAJOR_VERSION)
+AC_SUBST(SHARED_LIB_VERSION)
+AC_SUBST(AVAILABLE_LANGUAGES)
+
+# Check whether a debug mode should be enabled.
+AC_ARG_WITH([debug],
+    AS_HELP_STRING([--with-debug@<:@=full@:>@],
+      [Enable various amounts of debugging support (full adds a slow memory checker).]),
+    [with_debug=$withval],
+    [with_debug=no])
+
+# Whether the maintainer mode should be enabled.
+MY_MAINTAINER_MODE
+
+# Canonicalize the configuration name.
+
+# Check whether --with-system-type or --without-system-type was given.
+AC_ARG_WITH(system-type,
+    [  --with-system-type      Set the system type, like "sun-solaris10"],
+    [SYSTEM_TYPE="$withval"],
+    [SYSTEM_TYPE="$host_vendor-$host_os"])
+AC_ARG_WITH(machine-type,
+    [  --with-machine-type     Set the machine type, like "powerpc"],
+    [MACHINE_TYPE="$withval"],
+    [MACHINE_TYPE="$host_cpu"])
+AC_SUBST(SYSTEM_TYPE)
+AC_DEFINE_UNQUOTED([SYSTEM_TYPE], ["$SYSTEM_TYPE"],
+                   [Name of system, eg sun-solaris])
+AC_SUBST(MACHINE_TYPE)
+AC_DEFINE_UNQUOTED([MACHINE_TYPE], ["$MACHINE_TYPE"],
+                   [Machine type name, eg sparc])
+
+# Detect intel x86 like processor
+BASE_MACHINE_TYPE=$MACHINE_TYPE
+case $MACHINE_TYPE in
+  i?86) BASE_MACHINE_TYPE=i386 ;;
+esac
+
+# Save some variables and the command line options for mysqlbug
+SAVE_CC="$CC"
+SAVE_CXX="$CXX"
+SAVE_ASFLAGS="$ASFLAGS"
+SAVE_CFLAGS="$CFLAGS"
+SAVE_CXXFLAGS="$CXXFLAGS"
+SAVE_LDFLAGS="$LDFLAGS"
+SAVE_CXXLDFLAGS="$CXXLDFLAGS"
+CONF_COMMAND="$0 $ac_configure_args"
+AC_SUBST(CONF_COMMAND)
+AC_SUBST(SAVE_CC)
+AC_SUBST(SAVE_CXX)
+AC_SUBST(SAVE_ASFLAGS)
+AC_SUBST(SAVE_CFLAGS)
+AC_SUBST(SAVE_CXXFLAGS)
+AC_SUBST(SAVE_LDFLAGS)
+AC_SUBST(SAVE_CXXLDFLAGS)
+AC_SUBST(CXXLDFLAGS)
+
+#AC_ARG_PROGRAM			# Automaticly invoked by AM_INIT_AUTOMAKE
+
+AM_SANITY_CHECK
+# This is needed is SUBDIRS is set
+AC_PROG_MAKE_SET
+
+##############################################################################
+# The below section needs to be done before AC_PROG_CC
+##############################################################################
+
+# Hack for OS X/Darwin and Metrowerks CodeWarrior
+AC_ARG_WITH(darwin-mwcc,
+[  --with-darwin-mwcc      Use Metrowerks CodeWarrior wrappers on OS X/Darwin],[
+ if [ "with_darwin_mwcc" = yes ] ; then
+  builddir=`pwd`
+  ccwrapper="$builddir/support-files/MacOSX/mwcc-wrapper"
+  arwrapper="$builddir/support-files/MacOSX/mwar-wrapper"
+  CC="$ccwrapper"
+  CXX="$ccwrapper"
+  LD="$ccwrapper"
+  AR="$arwrapper"
+  RANLIB=:
+  export CC CXX LD AR RANLIB
+  AC_SUBST(AR)
+  AC_SUBST(RANLIB)
+ fi
+])
+
+AM_CONDITIONAL(DARWIN_MWCC, test x$with_darwin_mwcc = xyes)
+
+if test "x${CFLAGS-}" = x ; then
+  cflags_is_set=no
+else
+  cflags_is_set=yes
+fi
+
+if test "x${CPPFLAGS-}" = x ; then
+  cppflags_is_set=no
+else
+  cppflags_is_set=yes
+fi
+
+if test "x${LDFLAGS-}" = x ; then
+  ldflags_is_set=no
+else
+  ldflags_is_set=yes
+fi
+
+################ End of section to be done before AC_PROG_CC #################
+
+# The following hack should ensure that configure doesn't add optimizing
+# or debugging flags to CFLAGS or CXXFLAGS
+# C_EXTRA_FLAGS are flags that are automaticly added to both
+# CFLAGS and CXXFLAGS
+CFLAGS="$CFLAGS $C_EXTRA_FLAGS "
+CXXFLAGS="$CXXFLAGS $C_EXTRA_FLAGS "
+
+dnl Checks for programs.
+AC_PROG_AWK
+AC_PROG_CC
+AC_PROG_CXX
+AC_PROG_CPP
+
+# Print version of CC and CXX compiler (if they support --version)
+case $SYSTEM_TYPE in
+  *netware*)
+CC_VERSION=`$CC -version | grep -i version`
+    ;;
+  *)
+CC_VERSION=`$CC --version | sed 1q`
+    ;;
+esac
+if test $? -eq "0"
+then
+  AC_MSG_CHECKING("C Compiler version")
+  AC_MSG_RESULT("$CC $CC_VERSION")
+else
+CC_VERSION=""
+fi
+AC_SUBST(CC_VERSION)
+MYSQL_CHECK_CXX_VERSION
+
+# Fix for sgi gcc / sgiCC which tries to emulate gcc
+if test "$CC" = "sgicc"
+then
+  ac_cv_prog_gcc="no"
+fi
+if test "$CXX" = "sgi++"
+then
+  GXX="no"
+fi
+
+if test "$ac_cv_prog_gcc" = "yes"
+then
+  AS="$CC -c"
+  AC_SUBST(AS)
+else
+  AC_PATH_PROG(AS, as, as)
+fi
+
+# Still need ranlib for readline; local static use only so no libtool.
+AC_PROG_RANLIB
+# We use libtool
+#AC_LIBTOOL_WIN32_DLL
+AC_PROG_LIBTOOL
+
+# Ensure that we have --preserve-dup-deps defines, otherwise we get link
+# problems of 'mysql' with CXX=g++
+LIBTOOL="$LIBTOOL --preserve-dup-deps"
+AC_SUBST(LIBTOOL)dnl
+
+AC_SUBST(NM)dnl
+
+##############################################################################
+# In automake 1.12, the extension on generated yacc/bison header files changed
+##############################################################################
+
+YACC_HEXT="h"
+MAKEFILE_1ST=`head -1 "$srcdir/Makefile.in"`
+AMAKE_MAJOR=`expr "$MAKEFILE_1ST" : '.*generated by automake \([[0-9]]*\).*'`
+if test $? -eq "0" ; then
+  if test "$AMAKE_MAJOR" -gt "1" ; then
+    YACC_HEXT="hh"
+    CXXFLAGS="$CXXFLAGS -DYACC_HEXT_HH"
+  elif test "$AMAKE_MAJOR" -eq "1" ; then
+    AMAKE_MINOR=`expr "$MAKEFILE_1ST" : '.*generated by automake 1.\([[0-9]]*\).*'`
+    if test $? -eq "0" ; then
+      if test "$AMAKE_MINOR" -ge "12" ; then
+	YACC_HEXT="hh"
+        CXXFLAGS="$CXXFLAGS -DYACC_HEXT_HH"
+      fi
+    fi
+  fi
+fi
+AC_SUBST(YACC_HEXT)
+
+##############################################################################
+
+# NM= "$NM -X64"
+#archive_expsym_cmds= `echo "$archive_expsym_cmds" | sed -e '/"$(CC)"//'`
+#archive_expsym_cmds= "$CC -q64 $archive_expsym_cmds"
+#  CXXFLAGS=`echo "$CXXFLAGS -Werror" | sed -e 's/-fbranch-probabilities//; s/-Wall//; s/-ansi//; s/-pedantic//; s/-Wcheck//'`
+
+#AC_LIBTOOL_DLOPEN AC_LIBTOOL_WIN32_DLL AC_DISABLE_FAST_INSTALL AC_DISABLE_SHARED AC_DISABLE_STATIC
+
+# AC_PROG_INSTALL
+AC_PROG_INSTALL
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+
+# Not critical since the generated file is distributed
+AC_CHECK_PROGS(YACC, ['bison -y -p MYSQL'])
+AC_CHECK_PROG(PDFMANUAL, pdftex, manual.pdf)
+AC_CHECK_PROG(DVIS,      tex,    manual.dvi)
+
+AC_PATH_PROG(uname_prog, uname, no)
+
+# We should go through this and put all the explictly system dependent
+# stuff in one place
+AC_MSG_CHECKING(operating system)
+AC_CACHE_VAL(mysql_cv_sys_os,
+[
+if test "$uname_prog" != "no"; then
+  mysql_cv_sys_os="`uname`"
+else
+  mysql_cv_sys_os="Not Solaris"
+fi
+])
+AC_MSG_RESULT($mysql_cv_sys_os)
+
+# This should be rewritten to use $target_os
+case "$target_os" in
+  sco3.2v5*) 
+     CFLAGS="$CFLAGS -DSCO"
+     CXXFLAGS="$CXXFLAGS -DSCO"
+     LD='$(CC) $(CFLAGS)'
+     case "$CFLAGS" in
+       *-belf*) 
+         AC_SYS_COMPILER_FLAG(-belf,sco_belf_option,CFLAGS,[],[
+         case "$LDFLAGS" in
+           *-belf*) ;;
+           *) AC_MSG_WARN([Adding -belf option to ldflags.])
+              LDFLAGS="$LDFLAGS -belf"
+           ;;
+         esac
+         ])
+       ;;
+       *)
+         AC_SYS_COMPILER_FLAG(-belf,sco_belf_option,CFLAGS,[],[
+         case "$LDFLAGS" in
+           *-belf*) ;;
+           *)
+	     AC_MSG_WARN([Adding -belf option to ldflags.])
+             LDFLAGS="$LDFLAGS -belf"
+           ;;
+         esac
+         ])
+       ;;
+     esac
+  ;;
+  sysv5UnixWare* | sysv5OpenUNIX8*) 
+    if test "$GCC" != "yes"; then
+      # Use the built-in alloca()
+      CFLAGS="$CFLAGS -Kalloca"
+    fi
+    CXXFLAGS="$CXXFLAGS -DNO_CPLUSPLUS_ALLOCA"
+  ;;
+  sysv5SCO_SV6.0.0*)
+    if test "$GCC" != "yes"; then
+      # Use the built-in alloca()
+      CFLAGS="$CFLAGS -Kalloca"
+      CXXFLAGS="$CFLAGS -Kalloca"
+      # Use no_implicit for templates
+      CXXFLAGS="$CXXFLAGS -Tno_implicit"
+      AC_DEFINE([HAVE_EXPLICIT_TEMPLATE_INSTANTIATION],
+        [1], [Defined by configure. Use explicit template instantiation.])
+    fi
+  ;;
+esac
+AC_SUBST(CC)
+AC_SUBST(CFLAGS)
+AC_SUBST(CXX)
+AC_SUBST(CXXFLAGS)
+AC_SUBST(ASFLAGS)
+AC_SUBST(LD)
+AC_SUBST(INSTALL_SCRIPT)
+
+export CC CXX CFLAGS LD LDFLAGS AR ARFLAGS
+
+if test "$GCC" = "yes"
+then
+  # mysqld requires -fno-implicit-templates.
+  # Disable exceptions as they seams to create problems with gcc and threads.
+  # mysqld doesn't use run-time-type-checking, so we disable it.
+  # We should use -Wno-invalid-offsetof flag to disable some warnings from gcc
+  # regarding offset() usage in C++ which are done in a safe manner in the
+  # server
+  CXXFLAGS="$CXXFLAGS -fno-implicit-templates -fno-exceptions -fno-rtti"
+  AC_DEFINE([HAVE_EXPLICIT_TEMPLATE_INSTANTIATION],
+    [1], [Defined by configure. Use explicit template instantiation.])
+fi
+
+MYSQL_PROG_AR
+
+# libmysqlclient versioning when linked with GNU ld.
+if $LD --version 2>/dev/null| grep GNU >/dev/null 2>&1; then
+  LD_VERSION_SCRIPT="-Wl,--version-script=\$(top_builddir)/libmysql/libmysql.ver"
+  AC_CONFIG_FILES(libmysql/libmysql.ver)
+fi
+AC_SUBST(LD_VERSION_SCRIPT)
+
+
+# Avoid bug in fcntl on some versions of linux
+AC_MSG_CHECKING([if we should use 'skip-external-locking' as default for $target_os])
+# Any variation of Linux
+if expr "$target_os" : "[[Ll]]inux.*" > /dev/null
+then
+  MYSQLD_DEFAULT_SWITCHES="--skip-external-locking"
+  TARGET_LINUX="true"
+  AC_MSG_RESULT([yes])
+  AC_DEFINE([TARGET_OS_LINUX], [1], [Whether we build for Linux])
+else
+  MYSQLD_DEFAULT_SWITCHES=""
+  TARGET_LINUX="false"
+  AC_MSG_RESULT([no])
+fi
+AC_SUBST(MYSQLD_DEFAULT_SWITCHES)
+AC_SUBST(TARGET_LINUX)
+
+dnl Find paths to some shell programs
+AC_PATH_PROG(LN, ln, ln)
+# This must be able to take a -f flag like normal unix ln.
+AC_PATH_PROG(LN_CP_F, ln, ln)
+case $SYSTEM_TYPE in
+  *netware*) ;;
+  *)
+    # If ln -f does not exists use -s (AFS systems)
+    if test -n "$LN_CP_F"; then
+      LN_CP_F="$LN_CP_F -s"
+    fi
+    ;;
+esac
+
+AC_PATH_PROG(MV, mv, mv)
+AC_PATH_PROG(RM, rm, rm)
+AC_PATH_PROG(CP, cp, cp)
+AC_PATH_PROG(SED, sed, sed)
+AC_PATH_PROG(CMP, cmp, cmp)
+AC_PATH_PROG(CHMOD, chmod, chmod)
+AC_PATH_PROG(HOSTNAME, hostname, hostname)
+AC_PATH_PROG(DIFF, diff, diff)
+# Check for a GNU tar named 'gtar', or 'gnutar' (MacOS X) and
+# fall back to 'tar' otherwise and hope that it's a GNU tar as well
+AC_CHECK_PROGS(TAR, gnutar gtar tar)
+
+dnl We use a path for perl so the script startup works
+dnl We make sure to use perl, not perl5, in hopes that the RPMs will
+dnl not depend on the perl5 binary being installed (probably a bug in RPM)
+AC_PATH_PROG(PERL, perl, no)
+if test "$PERL" != "no" && $PERL -e 'require 5' > /dev/null 2>&1
+then
+  PERL5=$PERL
+else
+  AC_PATH_PROG(PERL5, perl5, no)
+  if test "$PERL5" != no
+  then
+    PERL=$PERL5
+    ac_cv_path_PERL=$ac_cv_path_PERL5
+  fi
+fi
+
+AC_SUBST(HOSTNAME)
+AC_SUBST(PERL)
+AC_SUBST(PERL5)
+
+# Enable the abi_check rule only if gcc is available
+
+if test "$GCC" != "yes" || expr "$CC" : ".*icc.*"
+then
+  ABI_CHECK=""
+else
+  ABI_CHECK="abi_check"
+fi
+
+AC_SUBST(ABI_CHECK)
+
+# Look for PS usage.  We use double dollar-signs in FIND_PROC because this
+# value is written to a makefile, which interprets away one level of
+# dollar-signs.  So, interpretation stages are  m4 and then shell in autoconf,
+# then Make, then shell.  The autoconf substitution uses single quotes, so 
+# no unprotected single quotes should appear in the expression.
+AC_PATH_PROG(PS, ps, ps)
+AC_MSG_CHECKING("how to check if pid exists")
+PS=$ac_cv_path_PS
+# Linux style
+if $PS wwwp $$ 2> /dev/null | grep -- "$0" > /dev/null
+then
+  FIND_PROC="$PS wwwp \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+# Solaris
+elif $PS -fp $$ 2> /dev/null | grep -- $0 > /dev/null
+then
+  FIND_PROC="$PS -p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+# BSD style
+elif $PS -uaxww 2> /dev/null | grep -- $0 > /dev/null
+then
+  FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
+# SysV style
+elif $PS -ef 2> /dev/null | grep -- $0 > /dev/null
+then
+  FIND_PROC="$PS -ef | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
+# Do anybody use this?
+elif $PS $$ 2> /dev/null | grep -- $0 > /dev/null
+then
+  FIND_PROC="$PS \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+else
+  case $SYSTEM_TYPE in
+    *freebsd*|*dragonfly*)
+      FIND_PROC="$PS p \$\$PID | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" > /dev/null"
+      ;;
+    *darwin*)
+      FIND_PROC="$PS -uaxww | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
+      ;;
+    *cygwin*)
+      FIND_PROC="$PS -e | grep -v \" grep\" | grep -v mysqld_safe | grep -- \"\$\$MYSQLD\" | grep \" \$\$PID \" > /dev/null"
+      ;;
+    *netware*)
+      FIND_PROC=
+      ;;
+    *)
+      AC_MSG_ERROR([Could not find the right ps and/or grep switches. Which OS is this?  See the Installation chapter in the Reference Manual.])
+  esac
+fi
+AC_SUBST(FIND_PROC)
+AC_MSG_RESULT("$FIND_PROC")
+
+# Check if a pid is valid
+AC_PATH_PROG(KILL, kill, kill)
+AC_MSG_CHECKING("for kill switches")
+if $ac_cv_path_KILL -0 $$
+then
+  CHECK_PID="$ac_cv_path_KILL -0 \$\$PID > /dev/null 2> /dev/null"
+elif kill -s 0 $$
+then
+  CHECK_PID="$ac_cv_path_KILL -s 0 \$\$PID > /dev/null 2> /dev/null"
+else
+  AC_MSG_WARN([kill -0 to check for pid seems to fail])
+    CHECK_PID="$ac_cv_path_KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null"
+fi
+AC_SUBST(CHECK_PID)
+AC_MSG_RESULT("$CHECK_PID")
+
+# We need an ANSI C compiler
+AM_PROG_CC_STDC
+
+# We need an assembler, too
+AM_PROG_AS
+CCASFLAGS="$CCASFLAGS $ASFLAGS"
+
+# Check if we need noexec stack for assembler
+AC_CHECK_NOEXECSTACK
+
+if test "$am_cv_prog_cc_stdc" = "no"
+then
+  AC_MSG_ERROR([MySQL requires an ANSI C compiler (and a C++ compiler). Try gcc. See the Installation chapter in the Reference Manual.])
+fi
+
+NOINST_LDFLAGS="-static"
+
+static_nss=""
+STATIC_NSS_FLAGS=""
+OTHER_LIBC_LIB=""
+AC_ARG_WITH(other-libc,
+ [  --with-other-libc=DIR   Link against libc and other standard libraries 
+                          installed in the specified non-standard location 
+                          overriding default. Originally added to be able to
+                          link against glibc 2.2 without making the user 
+                          upgrade the standard libc installation.],
+ [
+   other_libc_include="$withval/include"
+   other_libc_lib="$withval/lib"
+   with_other_libc="yes"
+   enable_shared="no"
+   all_is_static="yes"
+   CFLAGS="$CFLAGS -I$other_libc_include"
+   # There seems to be a feature in gcc that treats system and libc headers
+   # silently when they violatate ANSI C++ standard, but it is strict otherwise
+   # since gcc cannot now recognize that our headers are libc, we work around
+   # by telling it to be permissive. Note that this option only works with
+   # new versions of gcc (2.95.x and above)
+   CXXFLAGS="$CXXFLAGS -fpermissive -I$other_libc_include"
+   if test -f "$other_libc_lib/libnss_files.a"
+   then
+     # libc has been compiled with --enable-static-nss
+     # we need special flags, but we will have to add those later
+     STATIC_NSS_FLAGS="-lc -lnss_files -lnss_dns -lresolv"
+     STATIC_NSS_FLAGS="$STATIC_NSS_FLAGS $STATIC_NSS_FLAGS"
+     OTHER_LIBC_LIB="-static -L$other_libc_lib"
+     static_nss=1
+   else
+     # this is a dirty hack. We if we detect static nss glibc in the special
+     # location, we do not re-direct the linker to get libraries from there
+     # during check. The reason is that if we did, we would have to find a
+     # way to append the special static nss flags to LIBS every time we do
+     # any check - this is definitely feasible, but not worthwhile the risk
+     # of breaking other things. So for our purposes it would be sufficient
+     # to assume that whoever is using static NSS knows what he is doing and
+     # has sensible libraries in the regular location
+     LDFLAGS="$LDFLAGS -static -L$other_libc_lib "
+   fi
+   
+   # When linking against custom libc installed separately, we want to force
+   # all binary builds to be static, including the build done by configure
+   # itself to test for system features.
+   with_mysqld_ldflags="-all-static"
+   with_client_ldflags="-all-static"
+   NOINST_LDFLAGS="-all-static"
+ ],
+ [
+  other_libc_include=
+  other_libc_lib=
+  with_other_libc="no"
+ ]
+)
+AC_SUBST(NOINST_LDFLAGS)
+
+#
+# Check if we are using Linux and a glibc compiled with static nss
+# (this is true on the MySQL build machines to avoid NSS problems)
+#
+AC_CHECK_TOOL([NM], [nm]) 
+
+if test "$TARGET_LINUX" = "true" -a "$static_nss" = ""
+then
+  tmp=`$NM ${other_libc_lib:-/usr/lib*}/libc.a | grep _nss_files_getaliasent_r1`
+  if test -n "$tmp"
+  then
+     STATIC_NSS_FLAGS="-lc -lnss_files -lnss_dns -lresolv"
+     STATIC_NSS_FLAGS="$STATIC_NSS_FLAGS $STATIC_NSS_FLAGS"
+     static_nss=1
+  fi
+fi
+
+AC_MSG_CHECKING(whether features provided by the user community should be included.)
+AC_ARG_ENABLE(community-features,
+    AC_HELP_STRING(
+        [--disable-community-features], 
+        [Disable additional features provided by the user community.]),
+    [ ENABLE_COMMUNITY_FEATURES=$enableval ],
+    [ ENABLE_COMMUNITY_FEATURES=yes ]
+    )
+
+if test "$ENABLE_COMMUNITY_FEATURES" = "yes"
+then
+  AC_DEFINE([COMMUNITY_SERVER], [1],
+            [Whether features provided by the user community should be included])
+  AC_MSG_RESULT([yes])
+else
+  AC_MSG_RESULT([no])
+fi
+
+AC_ARG_WITH(server-suffix,
+    [  --with-server-suffix    Append value to the version string.],
+    [ MYSQL_SERVER_SUFFIX=`echo "$withval" | sed -e  's/^\(...................................\)..*$/\1/'` ],
+    [ MYSQL_SERVER_SUFFIX= ]
+    )
+AC_SUBST(MYSQL_SERVER_SUFFIX)
+
+# Set flags if we want to force to use pthreads
+AC_ARG_WITH(pthread,
+    [  --with-pthread          Force use of pthread library.],
+    [ with_pthread=$withval ],
+    [ with_pthread=no ]
+    )
+
+# Force use of thread libs LIBS
+AC_ARG_WITH(named-thread-libs,
+    [  --with-named-thread-libs=ARG
+                          Use specified thread libraries instead of 
+                          those automatically found by configure.],
+    [ with_named_thread=$withval ],
+    [ with_named_thread=no ]
+    )
+
+# Force use of a curses libs
+AC_ARG_WITH(named-curses-libs,
+    [  --with-named-curses-libs=ARG
+                          Use specified curses libraries instead of 
+                          those automatically found by configure.],
+    [ with_named_curses=$withval ],
+    [ with_named_curses=no ]
+    )
+
+# Make thread safe client
+AC_ARG_ENABLE(thread-safe-client,
+    [  --disable-thread-safe-client   
+                          Compile the client without threads.],
+    [ THREAD_SAFE_CLIENT=$enableval ],
+    [ THREAD_SAFE_CLIENT=yes ]
+    )
+
+# compile with strings functions in assembler
+AC_ARG_ENABLE(assembler,
+    [  --enable-assembler      Use assembler versions of some string 
+                          functions if available.],
+    [ ENABLE_ASSEMBLER=$enableval ],
+    [ ENABLE_ASSEMBLER=no ]
+    )
+
+AC_MSG_CHECKING(if we should use assembler functions)
+# For now we only support assembler on i386 and sparc systems
+AM_CONDITIONAL(ASSEMBLER_x86, test "$ENABLE_ASSEMBLER" = "yes" -a "$BASE_MACHINE_TYPE" = "i386" && $AS strings/strings-x86.s -o checkassembler >/dev/null 2>&1 && test -f checkassembler && (rm -f checkassembler; exit 0;))
+AM_CONDITIONAL(ASSEMBLER_sparc32, test "$ENABLE_ASSEMBLER" = "yes" -a "$BASE_MACHINE_TYPE" = "sparc")
+AM_CONDITIONAL(ASSEMBLER_sparc64, test "$ENABLE_ASSEMBLER" = "yes" -a "$BASE_MACHINE_TYPE" = "sparcv9")
+AM_CONDITIONAL(ASSEMBLER, test "$ASSEMBLER_x86_TRUE" = "" -o "$ASSEMBLER_sparc32_TRUE" = "")
+
+if test "$ASSEMBLER_TRUE" = ""
+then
+  AC_MSG_RESULT([yes])
+else
+  AC_MSG_RESULT([no])
+fi
+
+# Add query profiler
+AC_MSG_CHECKING(if SHOW PROFILE should be enabled.)
+AC_ARG_ENABLE(profiling,
+    AS_HELP_STRING([--enable-profiling], [Build a version with query profiling code (req. community-features)]),
+    [ ENABLED_PROFILING=$enableval ],
+    [ ENABLED_PROFILING=$ENABLE_COMMUNITY_FEATURES ])
+
+if test "$ENABLED_PROFILING" = "yes"
+then
+  if test "$ENABLE_COMMUNITY_FEATURES" = "yes";
+  then
+    AC_DEFINE([ENABLED_PROFILING], [1],
+              [If SHOW PROFILE should be enabled])
+    AC_MSG_RESULT([yes]) 
+  else
+    ENABLED_PROFILING="no"
+    AC_MSG_RESULT([no, overridden by community-features disabled])
+  fi
+else
+  AC_MSG_RESULT([no])
+fi
+
+# Use this to set the place used for unix socket used to local communication.
+AC_ARG_WITH(unix-socket-path,
+    [  --with-unix-socket-path=SOCKET
+                          Where to put the unix-domain socket.  SOCKET must be 
+                          an absolute file name.],
+    [ MYSQL_UNIX_ADDR=$withval ],
+    [ MYSQL_UNIX_ADDR=$MYSQL_UNIX_ADDR_DEFAULT ]
+    )
+AC_SUBST(MYSQL_UNIX_ADDR)
+
+AC_ARG_WITH(tcp-port,
+    [  --with-tcp-port=port-number
+                          Which port to use for MySQL services (default 3306)],
+    [ MYSQL_TCP_PORT=$withval ],
+    [ MYSQL_TCP_PORT=$MYSQL_TCP_PORT_DEFAULT
+      # if we actually defaulted (as opposed to the pathological case of
+      # --with-tcp-port=<MYSQL_TCP_PORT_DEFAULT> which might in theory
+      # happen if whole batch of servers was built from a script), set
+      # the default to zero to indicate that; we don't lose information
+      # that way, because 0 obviously indicates that we can get the
+      # default value from MYSQL_TCP_PORT. this seems really evil, but
+      # testing for MYSQL_TCP_PORT==MYSQL_TCP_PORT_DEFAULT would make a
+      # a port of MYSQL_TCP_PORT_DEFAULT magic even if the builder did not
+      # intend it to mean "use the default, in fact, look up a good default
+      # from /etc/services if you can", but really, really meant 3306 when
+      # they passed in 3306. When they pass in a specific value, let them
+      # have it; don't second guess user and think we know better, this will
+      # just make people cross.  this makes the the logic work like this
+      # (which is complicated enough):
+      #
+      # - if a port was set during build, use that as a default.
+      #
+      # - otherwise, try to look up a port in /etc/services; if that fails,
+      #   use MYSQL_TCP_PORT_DEFAULT (at the time of this writing 3306)
+      #
+      # - allow the MYSQL_TCP_PORT environment variable to override that.
+      #
+      # - allow command-line parameters to override all of the above.
+      #
+      # the top-most MYSQL_TCP_PORT_DEFAULT is read from win/configure.js,
+      # so don't mess with that.
+      MYSQL_TCP_PORT_DEFAULT=0 ]
+    )
+AC_SUBST(MYSQL_TCP_PORT)
+# We might want to document the assigned port in the manual.
+AC_SUBST(MYSQL_TCP_PORT_DEFAULT)
+
+# Use this to set the place used for unix socket used to local communication.
+AC_ARG_WITH(mysqld-user,
+    [  --with-mysqld-user=username   
+                          What user the mysqld daemon shall be run as.],
+    [ MYSQLD_USER=$withval ],
+    [ MYSQLD_USER=mysql ]
+    )
+AC_SUBST(MYSQLD_USER)
+
+# If we should allow LOAD DATA LOCAL
+AC_MSG_CHECKING(If we should should enable LOAD DATA LOCAL by default)
+AC_ARG_ENABLE(local-infile,
+    [  --enable-local-infile   Enable LOAD DATA LOCAL INFILE (default: disabled)],
+    [ ENABLED_LOCAL_INFILE=$enableval ],
+    [ ENABLED_LOCAL_INFILE=no ]
+    )
+if test "$ENABLED_LOCAL_INFILE" = "yes"
+then
+  AC_MSG_RESULT([yes])
+  AC_DEFINE([ENABLED_LOCAL_INFILE], [1],
+            [If LOAD DATA LOCAL INFILE should be enabled by default])
+else
+  AC_MSG_RESULT([no])
+fi
+
+# If we should allow init-file, skip-grant-table and bootstrap options
+AC_MSG_CHECKING(If we should should enable init-file, skip-grant-table options and bootstrap)
+AC_ARG_ENABLE(grant-options,
+    [  --disable-grant-options Disables the use of --init-file, --skip-grant-tables and --bootstrap options],
+    [ mysql_grant_options_enabled=$enableval ],
+    [ mysql_grant_options_enabled=yes ]
+    )
+if test "$mysql_grant_options_enabled" = "yes"
+then
+  AC_MSG_RESULT([yes])
+else
+  AC_DEFINE([DISABLE_GRANT_OPTIONS], [1],
+            [Disables the use of --init-file, --skip-grant-tables and --bootstrap options])
+  AC_MSG_RESULT([no])
+fi
+
+MYSQL_SYS_LARGEFILE
+
+# Types that must be checked AFTER large file support is checked
+AC_TYPE_SIZE_T
+
+#--------------------------------------------------------------------
+# Check for system header files
+#--------------------------------------------------------------------
+
+AC_HEADER_DIRENT
+AC_HEADER_STDC
+AC_HEADER_SYS_WAIT
+AC_CHECK_HEADERS(fcntl.h fenv.h float.h floatingpoint.h fpu_control.h \
+ ieeefp.h limits.h memory.h pwd.h select.h poll.h \
+ stdlib.h stddef.h \
+ strings.h string.h synch.h sys/mman.h sys/socket.h netinet/in.h arpa/inet.h \
+ sys/timeb.h sys/types.h sys/un.h sys/vadvise.h sys/wait.h term.h \
+ unistd.h utime.h sys/utime.h termio.h termios.h sched.h crypt.h alloca.h \
+ sys/ioctl.h malloc.h sys/malloc.h sys/ipc.h sys/shm.h linux/config.h \
+ sys/prctl.h sys/resource.h sys/param.h port.h ieeefp.h \
+ execinfo.h)
+
+AC_CHECK_HEADERS([xfs/xfs.h])
+
+#--------------------------------------------------------------------
+# Check for system libraries. Adds the library to $LIBS
+# and defines HAVE_LIBM etc
+#--------------------------------------------------------------------
+
+AC_CHECK_LIB(m, floor, [], AC_CHECK_LIB(m, __infinity))
+
+AC_CHECK_LIB(nsl_r, gethostbyname_r, [],
+  AC_CHECK_LIB(nsl, gethostbyname_r))
+AC_CHECK_FUNC(gethostbyname_r)
+
+AC_SEARCH_LIBS(setsockopt, socket)
+# This may get things to compile even if bind-8 is installed
+AC_SEARCH_LIBS(bind, bind)
+# Check if crypt() exists in libc or libcrypt, sets LIBS if needed
+AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt]))
+# See if we need a library for address lookup.
+AC_SEARCH_LIBS(inet_aton, [socket nsl resolv])
+
+# For the sched_yield() function on Solaris
+AC_SEARCH_LIBS(sched_yield, posix4, 
+  AC_DEFINE(HAVE_SCHED_YIELD, 1, [sched_yield]))
+
+MYSQL_CHECK_ZLIB_WITH_COMPRESS
+
+# For large pages support
+if test "$TARGET_LINUX" = "true"
+then
+  # For SHM_HUGETLB on Linux
+  AC_CHECK_DECLS(SHM_HUGETLB, 
+      AC_DEFINE([HAVE_LARGE_PAGES], [1], 
+                [Define if you have large pages support])
+      AC_DEFINE([HUGETLB_USE_PROC_MEMINFO], [1],
+                [Define if /proc/meminfo shows the huge page size (Linux only)])
+      , ,
+      [
+#include <sys/shm.h>
+      ]
+  )
+fi
+
+#--------------------------------------------------------------------
+# Check for TCP wrapper support
+#--------------------------------------------------------------------
+
+AC_ARG_WITH(libwrap,
+[  --with-libwrap[=DIR]      Compile in libwrap (tcp_wrappers) support],[
+  case "$with_libwrap" in
+  no) : ;;
+  yes|*)
+    _cppflags=${CPPFLAGS}
+    _ldflags=${LDFLAGS}
+
+    if test "$with_libwrap" != "yes"; then
+      CPPFLAGS="${CPPFLAGS} -I$with_libwrap/include"
+      LDFLAGS="${LDFLAGS} -L$with_libwrap/lib"
+    fi
+
+    _libs=${LIBS}
+    AC_CHECK_HEADER(tcpd.h,
+      LIBS="-lwrap $LIBS"
+      AC_MSG_CHECKING(for TCP wrappers library -lwrap)
+      AC_TRY_LINK([#include <tcpd.h>
+int allow_severity = 0;
+int deny_severity  = 0;
+
+struct request_info *req;
+],[hosts_access (req)],
+        AC_MSG_RESULT(yes)
+        AC_DEFINE([LIBWRAP], [1], [Define if you have -lwrap])
+        AC_DEFINE([HAVE_LIBWRAP], [1], [Define if have -lwrap])
+	if test "$with_libwrap" != "yes"; then
+	    WRAPLIBS="-L${with_libwrap}/lib"
+	fi
+	WRAPLIBS="${WRAPLIBS} -lwrap",
+        AC_MSG_RESULT(no)
+        CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags}),
+      CPPFLAGS=${_cppflags} LDFLAGS=${_ldflags})
+    LDFLAGS=${_ldflags} LIBS=${_libs}
+    ;;
+  esac
+])
+AC_SUBST(WRAPLIBS)
+
+# Check for gtty if termio.h doesn't exists
+if test "$ac_cv_header_termio_h" = "no" -a "$ac_cv_header_termios_h" = "no"
+then
+  AC_SEARCH_LIBS(gtty, compat)
+fi
+
+# We make a special variable for non-threaded version of LIBS to avoid
+# including thread libs into non-threaded version of MySQL client library.
+# Later in this script LIBS will be augmented with a threads library.
+NON_THREADED_LIBS="$LIBS"
+
+AC_CHECK_TYPES([int8, uint8, int16, uint16, int32, uint32, int64, uint64,
+                uchar, uint, ulong],[],[], [
+#include <sys/types.h>
+])
+AC_CHECK_TYPES([in_addr_t], [], [], [
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+])
+AC_CHECK_TYPES([fp_except], [], [], [
+#include <sys/types.h>
+#include <ieeefp.h>
+])
+
+#
+# Some system specific hacks
+#
+
+MAX_C_OPTIMIZE="-O3"
+MAX_CXX_OPTIMIZE="-O3"
+
+case $SYSTEM_TYPE in
+  *solaris2.7*)
+    # Solaris 2.7 has a broken /usr/include/widec.h
+    # Make a fixed copy in ./include
+    AC_MSG_WARN([Fixing broken include files for $SYSTEM_TYPE])
+    echo "  - Creating local copy of widec.h"
+    if test ! -d include
+    then
+      mkdir ./include
+    fi
+    builddir=`pwd`
+    sed -e "s|^#if[ 	]*!defined(lint) && !defined(__lint)|#if !defined\(lint\) \&\& !defined\(__lint\) \&\& !defined\(getwc\)|" < /usr/include/widec.h > include/widec.h
+    CFLAGS="$CFLAGS -DHAVE_CURSES_H -I$builddir/include -DHAVE_RWLOCK_T"
+    CXXFLAGS="$CXXFLAGS -DHAVE_CURSES_H -I$builddir/include -DHAVE_RWLOCK_T"
+    ;;
+  *solaris2.8*)
+    # Solaris 2.8 has a broken /usr/include/widec.h
+    # Make a fixed copy in ./include
+    AC_MSG_WARN([Fixing broken include files for $SYSTEM_TYPE])
+    echo "  - Creating local copy of widec.h"
+    if test ! -d include
+    then
+      mkdir ./include
+    fi
+    builddir=`pwd`
+    sed -e "s|^#if[ 	]*!defined(__lint)|#if !defined\(__lint\) \&\& !defined\(getwc\)|" < /usr/include/widec.h > include/widec.h
+    CFLAGS="$CFLAGS -DHAVE_CURSES_H -I$builddir/include -DHAVE_RWLOCK_T"
+    CXXFLAGS="$CXXFLAGS -DHAVE_CURSES_H -I$builddir/include -DHAVE_RWLOCK_T"
+    ;;
+  *solaris2.5.1*)
+    AC_MSG_WARN([Enabling getpass() workaround for Solaris 2.5.1])
+    CFLAGS="$CFLAGS -DHAVE_BROKEN_GETPASS -DSOLARIS -DHAVE_RWLOCK_T";
+    CXXFLAGS="$CXXFLAGS -DHAVE_RWLOCK_T -DSOLARIS"
+    ;;
+  *solaris*)
+    CFLAGS="$CFLAGS -DHAVE_RWLOCK_T"
+    CXXFLAGS="$CXXFLAGS -DHAVE_RWLOCK_T"
+    ;;
+  *SunOS*)
+    AC_MSG_WARN([Enabling getpass() workaround for SunOS])
+    CFLAGS="$CFLAGS -DHAVE_BROKEN_GETPASS -DSOLARIS";
+    ;;
+  *hpux10.20*)
+    AC_MSG_WARN([Enabling workarounds for hpux 10.20])
+    CFLAGS="$CFLAGS -DHAVE_BROKEN_SNPRINTF -DSIGNALS_DONT_BREAK_READ -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHPUX10 -DSIGNAL_WITH_VIO_CLOSE -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT -DHAVE_POSIX1003_4a_MUTEX"
+    CXXFLAGS="$CXXFLAGS -DHAVE_BROKEN_SNPRINTF -D_INCLUDE_LONGLONG -DSIGNALS_DONT_BREAK_READ -DDO_NOT_REMOVE_THREAD_WRAPPERS -DHPUX10 -DSIGNAL_WITH_VIO_CLOSE -DHAVE_BROKEN_PTHREAD_COND_TIMEDWAIT -DHAVE_POSIX1003_4a_MUTEX"
+    if test "$with_named_thread" = "no"
+    then 
+      AC_MSG_WARN([Using --with-named-thread=-lpthread])
+      with_named_thread="-lcma"
+    fi
+    ;;
+  *hpux11.*)
+    AC_MSG_WARN([Enabling workarounds for hpux 11])
+    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])
+      with_named_thread="-lpthread"
+    fi
+    # Fixes for HPUX 11.0 compiler
+    if test "$ac_cv_prog_gcc" = "no"
+    then
+      CFLAGS="$CFLAGS -DHAVE_BROKEN_INLINE"
+# set working flags first in line, letting override it (i. e. for debug):
+      CXXFLAGS="+O2 $CXXFLAGS"
+      MAX_C_OPTIMIZE=""
+      MAX_CXX_OPTIMIZE=""
+      ndb_cxxflags_fix="$ndb_cxxflags_fix -Aa"
+    fi
+    ;;
+  *rhapsody*)
+    if test "$ac_cv_prog_gcc" = "yes"
+    then
+      CPPFLAGS="$CPPFLAGS -traditional-cpp "
+      CFLAGS="-DHAVE_CTHREADS_WRAPPER -DDO_NOT_REMOVE_THREAD_WRAPPERS"
+      CXXFLAGS="-DHAVE_CTHREADS_WRAPPER"
+      if test $with_named_curses = "no"
+      then
+	with_named_curses=""
+      fi
+    fi
+    ;;
+  *darwin5*)
+    if test "$ac_cv_prog_gcc" = "yes"
+    then
+      FLAGS="-traditional-cpp -DHAVE_DARWIN5_THREADS -D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH"
+      CFLAGS="$CFLAGS $FLAGS"
+      CXXFLAGS="$CXXFLAGS $FLAGS"
+      MAX_C_OPTIMIZE="-O"
+      with_named_curses=""
+    fi
+    ;;
+  *darwin6*)
+    if test "$ac_cv_prog_gcc" = "yes"
+    then
+      FLAGS="-D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DHAVE_BROKEN_REALPATH -DDONT_DECLARE_CXA_PURE_VIRTUAL "
+      CFLAGS="$CFLAGS $FLAGS"
+      CXXFLAGS="$CXXFLAGS $FLAGS"
+      MAX_C_OPTIMIZE="-O"
+    fi
+    ;;
+  *darwin*)
+    if test "$ac_cv_prog_gcc" = "yes"
+    then
+      FLAGS="-D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ -DIGNORE_SIGHUP_SIGQUIT  -DDONT_DECLARE_CXA_PURE_VIRTUAL"
+      CFLAGS="$CFLAGS $FLAGS"
+      CXXFLAGS="$CXXFLAGS $FLAGS"
+      MAX_C_OPTIMIZE="-O"
+    fi
+    ;;
+  *freebsd*|*dragonfly*)
+    AC_MSG_WARN([Adding fix for interrupted reads])
+    OSVERSION=`sysctl -a | grep osreldate | awk '{ print $2 }'`
+    if test "$OSVERSION" -gt "480100" && \
+       test "$OSVERSION" -lt "500000" || \
+       test "$OSVERSION" -gt "500109"
+    then
+       CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000"
+    else
+       CFLAGS="$CFLAGS -DHAVE_BROKEN_REALPATH"
+       CXXFLAGS="$CXXFLAGS -DMYSQLD_NET_RETRY_COUNT=1000000 -DHAVE_BROKEN_REALPATH"
+    fi
+    ;;
+  *netbsd*)
+    AC_MSG_WARN([Adding flag -Dunix])
+    CFLAGS="$CFLAGS -Dunix"
+    CXXFLAGS="$CXXFLAGS -Dunix"
+    OVERRIDE_MT_LD_ADD="\$(top_srcdir)/mit-pthreads/obj/libpthread.a"
+    ;;
+  *bsdi*)
+    AC_MSG_WARN([Adding fix for BSDI])
+    CFLAGS="$CFLAGS -D__BSD__ -DHAVE_BROKEN_REALPATH"
+    AC_DEFINE_UNQUOTED([SOCKOPT_OPTLEN_TYPE], [size_t],
+                       [Last argument to get/setsockopt])
+    ;;
+   *sgi-irix6*)
+    if test "$with_named_thread" = "no"
+    then 
+      AC_MSG_WARN([Using --with-named-thread=-lpthread])
+      with_named_thread="-lpthread"
+    fi
+    CXXFLAGS="$CXXFLAGS -D_BOOL"
+    ;;
+    *aix4.3*)
+      AC_MSG_WARN([Adding defines for AIX])
+      CFLAGS="$CFLAGS -Wa,-many -DUNDEF_HAVE_INITGROUPS -DSIGNALS_DONT_BREAK_READ"
+      CXXFLAGS="$CXXFLAGS -Wa,-many -DUNDEF_HAVE_INITGROUPS -DSIGNALS_DONT_BREAK_READ"
+    ;;
+dnl Is this the right match for DEC OSF on alpha?
+    *dec-osf*)
+      if test "$ac_cv_prog_gcc" = "yes" && test "$host_cpu" = "alpha"
+      then
+	  AC_MSG_WARN([Adding defines for DEC OSF on alpha])
+	  CFLAGS="$CFLAGS -mieee"
+	  CXXFLAGS="$CXXFLAGS -mieee"
+      fi
+      AC_MSG_WARN([Adding defines for OSF1])
+      # gethostbyname_r is deprecated and doesn't work ok on OSF1
+      CFLAGS="$CFLAGS -DUNDEF_HAVE_GETHOSTBYNAME_R -DSNPRINTF_RETURN_TRUNC"
+      CXXFLAGS="$CXXFLAGS -DUNDEF_HAVE_GETHOSTBYNAME_R -DSNPRINTF_RETURN_TRUNC"
+      # fix to handle include of <stdint.h> correctly on OSF1 with cxx compiler
+      CXXFLAGS="$CXXFLAGS -I/usr/include/cxx -I/usr/include/cxx_cname -I/usr/include -I/usr/include.dtk"
+    ;;
+  *netware*)
+    # No need for curses library so set it to null
+    with_named_curses=""
+
+    # No thread library - in LibC
+    with_named_thread=""
+    
+    #
+    # Edit Makefile.in files.
+    #
+    echo -n "configuring Makefile.in files for NetWare... "
+    for file in sql/Makefile.in extra/Makefile.in client/Makefile.in
+    do
+    # echo "#### $file ####"
+      filedir="`dirname $file`"
+      filebase="`basename $file`"
+      filesed=$filedir/$filebase.sed
+      #
+      # Backup and always use original file
+      #
+      if test -f $file.bk
+      then
+        cp -fp $file.bk $file
+      else
+        cp -fp $file $file.bk
+      fi
+      case $file in
+        sql/Makefile.in)
+          # Use gen_lex_hash.linux instead of gen_lex_hash
+          # Add library dependencies to mysqld_DEPENDENCIES
+          lib_DEPENDENCIES="\$(openssl_libs) \$(yassl_libs)"
+          cat > $filesed << EOF
+s,\(\./gen_lex_hash\)\$(EXEEXT),\1.linux,
+s%\(mysqld_DEPENDENCIES = \)%\1$lib_DEPENDENCIES %
+EOF
+          ;;
+        extra/Makefile.in)
+          cat > $filesed << EOF
+s,\(extra/comp_err\)\$(EXEEXT),\1.linux,
+EOF
+          ;;
+        libmysql/Makefile.in)
+          cat > $filesed << EOF
+s,libyassl.la,.libs/libyassl.a,
+s,libtaocrypt.la,.libs/libtaocrypt.a,
+EOF
+          ;;
+        libmysql_r/Makefile.in)
+          cat > $filesed << EOF
+s,libyassl.la,.libs/libyassl.a,
+s,libtaocrypt.la,.libs/libtaocrypt.a,
+EOF
+          ;;
+        client/Makefile.in)
+          #
+          cat > $filesed << EOF
+s,libmysqlclient.la,.libs/libmysqlclient.a,
+EOF
+          ;;
+      esac
+      if `sed -f $filesed $file > $file.nw`;\
+      then
+        mv -f $file.nw $file
+        rm -f $filesed
+      else
+        exit 1
+      fi
+      # wait for file system changes to complete
+      sleep 1
+    done
+    echo "done"
+
+    #
+    # Make sure the following files are writable.
+    #
+    # When the files are retrieved from some source code control systems they are read-only.
+    #
+    echo -n "making sure specific build files are writable... "
+    for file in \
+        Docs/manual.chm \
+        Docs/mysql.info \
+        Docs/INSTALL-BINARY \
+        INSTALL-SOURCE \
+        COPYING
+    do
+      if test -e $file; then
+        chmod +w $file
+      fi
+    done
+    echo "done"
+
+    ;;
+esac
+
+
+#---START: Used in for client configure
+# Check if we threads are in libc or if we should use
+# -lpthread, -lpthreads or mit-pthreads
+# We have to check libc last because else it fails on Solaris 2.6
+
+with_posix_threads="no"
+# Search thread lib on Linux
+if test "$with_named_thread" = "no"
+then
+    AC_MSG_CHECKING("Linux threads")
+    if test "$TARGET_LINUX" = "true"
+    then
+        AC_MSG_RESULT("starting")
+        # use getconf to check glibc contents
+        AC_MSG_CHECKING("getconf GNU_LIBPTHREAD_VERSION")
+        case `getconf GNU_LIBPTHREAD_VERSION | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ` in
+        NPTL* )
+                AC_MSG_RESULT("NPTL")
+                AC_DEFINE([HAVE_NPTL], [1], [NPTL threads implementation])
+                with_named_thread="-lpthread"
+                ;;
+        LINUXTHREADS* )
+                AC_MSG_RESULT("Linuxthreads")
+                AC_DEFINE([HAVE_LINUXTHREADS], [1], 
+                      [Whether we are using Xavier Leroy's LinuxThreads])
+                with_named_thread="-lpthread"
+                ;;
+        * )
+                AC_MSG_RESULT("unknown")
+                ;;
+        esac
+        if test "$with_named_thread" = "no"
+        then
+          # old method, check headers
+          # Look for LinuxThreads.
+          AC_MSG_CHECKING("LinuxThreads in header file comment")
+          res=`grep Linuxthreads /usr/include/pthread.h 2>/dev/null | wc -l`
+          if test "$res" -gt 0
+          then
+            AC_MSG_RESULT("Found")
+            AC_DEFINE([HAVE_LINUXTHREADS], [1],
+                  [Whether we are using Xavier Leroy's LinuxThreads])
+            # Linux 2.0 sanity check
+            AC_TRY_COMPILE([#include <sched.h>], [int a = sched_get_priority_min(1);], ,
+                  AC_MSG_ERROR([Syntax error in sched.h. Change _P to __P in the /usr/include/sched.h file. See the Installation chapter in the Reference Manual]))
+            # RedHat 5.0 does not work with dynamic linking of this. -static also
+            # gives a speed increase in linux so it does not hurt on other systems.
+            with_named_thread="-lpthread"
+          else
+            AC_MSG_RESULT("Not found")
+            # If this is a linux machine we should barf
+            AC_MSG_ERROR([This is a Linux system without a working getconf, 
+and Linuxthreads was not found. Please install it (or a new glibc) and try again.  
+See the Installation chapter in the Reference Manual for more information.])
+          fi
+        else
+            AC_MSG_RESULT("no need to check headers")
+        fi
+        
+        AC_MSG_CHECKING("for pthread_create in -lpthread")
+        ac_save_LIBS="$LIBS"
+        LIBS="$LIBS -lpthread"
+        AC_TRY_LINK( [#include <pthread.h>],
+              [ (void) pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],
+              AC_MSG_RESULT("yes"),
+              [ AC_MSG_RESULT("no")
+                AC_MSG_ERROR([
+This is a Linux system claiming to support threads, either Linuxthreads or NPTL, but linking a test program failed.  
+Please install one of these (or a new glibc) and try again.  
+See the Installation chapter in the Reference Manual for more information.]) ]
+              )
+        LIBS="$ac_save_LIBS"
+    else
+        AC_MSG_RESULT("no")
+    fi  # "$TARGET_LINUX" 
+fi  # "$with_named_thread" = "no" -a "$with_mit_threads" = "no"
+
+
+# Hack for DEC-UNIX (OSF1 -> Tru64)
+if test "$with_named_thread" = "no" -a "$with_mit_threads" = "no"
+then
+    AC_MSG_CHECKING("DEC threads post OSF/1 3.2")
+    if test -f /usr/shlib/libpthread.so -a -f /usr/lib/libmach.a -a -f /usr/ccs/lib/cmplrs/cc/libexc.a
+    then
+      with_named_thread="-lpthread -lmach -lexc"
+      CFLAGS="$CFLAGS -D_REENTRANT"
+      CXXFLAGS="$CXXFLAGS -D_REENTRANT"
+      AC_DEFINE(HAVE_DEC_THREADS, [1], [Whether we are using DEC threads])
+      AC_MSG_RESULT("yes")
+    else
+      AC_MSG_RESULT("no")
+    fi  # DEC threads
+fi  # "$with_named_thread" = "no" -a "$with_mit_threads" = "no"
+
+
+dnl This is needed because -lsocket has to come after the thread
+dnl library on SCO.
+AC_DEFUN([MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK], [
+  LIBS=`echo " $LIBS " | sed -e 's/ -lsocket / /g'`
+])
+# Hack for SCO UNIX
+if test "$with_named_thread" = "no"
+then
+  AC_MSG_CHECKING("SCO threads")
+  if expr "$SYSTEM_TYPE" : ".*sco.*" > /dev/null
+  then
+    if test -f /usr/lib/libgthreads.a -o -f /usr/lib/libgthreads.so
+    then
+      MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK
+      with_named_thread="-lgthreads -lsocket -lgthreads"
+      # sched.h conflicts with fsu-threads
+      touch ./include/sched.h
+      touch ./include/semaphore.h
+
+      # We must have gcc
+      if expr "$CC" : ".*gcc.*"
+      then
+	AC_MSG_RESULT("yes")
+      else
+	AC_MSG_ERROR([On SCO UNIX MySQL must be compiled with gcc. See the Installation chapter in the Reference Manual.])
+      fi
+      AC_MSG_RESULT("yes")
+    elif test -f /usr/local/lib/libpthread.a -o -f /usr/local/lib/libpthread.so
+    then
+      MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK
+      with_named_thread="-lpthread -lsocket"
+      # sched.h conflicts with fsu-threads
+      # touch ./include/sched.h
+
+      AC_MSG_CHECKING("for gcc")
+      # We must have gcc
+      if expr "$CC" : ".*gcc.*"
+      then
+	AC_MSG_RESULT("yes")
+      else
+	AC_MSG_ERROR([On SCO UNIX MySQL must be compiled with gcc. See the Installation chapter in the Reference Manual.])
+      fi
+      AC_MSG_RESULT("yes")
+    # Hack for SCO UnixWare 7.1.x
+    #
+    elif test "$with_named_thread" = "no"
+    then
+      AC_MSG_RESULT("no")
+      AC_MSG_CHECKING("SCO UnixWare 7.1.x native threads")
+      if expr "$SYSTEM_TYPE" : ".*sco.*" > /dev/null
+      then
+        if test -f /usr/lib/libthread.so -o -f /usr/lib/libthreadT.so
+        then
+	  MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK
+          if expr "$CC" : ".*gcc.*"
+          then
+            with_named_thread="-pthread -lsocket -lnsl"
+          else
+            with_named_thread="-Kthread -lsocket -lnsl"
+          fi
+          if expr "$SYSTEM_TYPE" : ".*unixware7.0.0" > /dev/null
+          then
+            AC_DEFINE(HAVE_UNIXWARE7_THREADS, [1])
+          fi
+          AC_MSG_RESULT("yes")
+          # We must have cc
+          AC_MSG_CHECKING("for gcc")
+          if expr "$CC" : ".*gcc.*"
+          then
+	    CC="$CC -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"
+	    CXX="$CXX -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"
+          else
+	    CC="$CC -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"
+	    CXX="$CXX -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK"
+          fi
+        else
+          AC_MSG_ERROR([configure: error: Can't find thread libs on SCO UnixWare7. See the Installation chapter in the Reference Manual.]) 
+        fi
+      else
+        AC_MSG_RESULT("no")
+      fi
+    else
+      AC_MSG_ERROR([On SCO UNIX MySQL requires that the FSUThreads package is installed. See the Installation chapter in the Reference Manual.])
+    fi
+  else
+    AC_MSG_RESULT("no")
+  fi
+fi
+
+#
+# Check for SCO threading libraries
+#
+if test "$with_named_thread" = "no"
+then
+  AC_MSG_CHECKING([SCO OpenServer 6, UnixWare 7 or OpenUNIX 8 native threads])
+  if expr "$SYSTEM_TYPE" : ".*UnixWare.*" > /dev/null || \
+     expr "$SYSTEM_TYPE" : ".*SCO_SV6.*" > /dev/null || \
+     expr "$SYSTEM_TYPE" : ".*OpenUNIX.*" > /dev/null
+  then
+    if test -f /usr/lib/libthread.so -o -f /usr/lib/libthreadT.so
+    then
+      MYSQL_REMOVE_SOCKET_FROM_LIBS_HACK
+      if expr "$CC" : ".*gcc.*" > /dev/null
+      then
+        with_named_thread="-pthread -lsocket -lnsl"
+	CC="$CC -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK";
+	CXX="$CXX -pthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK";
+      else
+        with_named_thread="-Kthread -lsocket -lnsl"
+	CC="$CC -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK";
+	CXX="$CXX -Kthread -DUNIXWARE_7 -DHAVE_BROKEN_RWLOCK";
+      fi
+      if expr "$SYSTEM_TYPE" : ".*unixware7.0.0" > /dev/null
+      then
+        AC_DEFINE(HAVE_UNIXWARE7_THREADS, [1], [Have UnixWare 7 (or similar) almost-POSIX threading library])
+      fi
+      AC_MSG_RESULT(yes)
+    else
+      AC_MSG_ERROR([configure: error: Can't find thread library on SCO/Caldera system. See the Installation chapter in the Reference Manual.]) 
+    fi
+  else
+    AC_MSG_RESULT(no)
+  fi
+fi
+
+# Hack for Siemens UNIX
+if test "$with_named_thread" = "no"
+then
+  AC_MSG_CHECKING("Siemens threads")
+  if test -f /usr/lib/libxnet.so -a "$SYSTEM_TYPE" = "sni-sysv4"
+  then
+    LIBS="-lxnet $LIBS"
+    NON_THREADED_LIBS="-lxnet $NON_THREADED_LIBS"
+    with_named_thread="-Kthread $LDFLAGS -lxnet"
+    LD_FLAGS=""
+    CFLAGS="-Kthread $CFLAGS"
+    CXXFLAGS="-Kthread $CXXFLAGS"
+    AC_MSG_RESULT("yes")
+  else
+    AC_MSG_RESULT("no")
+  fi
+fi
+
+# Use library named -lpthread
+if test "$with_named_thread" = "no" -a "$with_pthread" = "yes"
+then
+    with_named_thread="-lpthread"
+fi
+
+#---END:
+
+# Hack for Solaris >= 2.5
+# We want both the new and the old interface
+ 
+if test "$with_named_thread" = "no"
+then
+  AC_MSG_CHECKING("Solaris threads")
+  if test -f /usr/lib/libpthread.so -a -f /usr/lib/libthread.so
+  then
+    with_named_thread="-lpthread -lthread"
+    AC_MSG_RESULT("yes")
+  else
+    AC_MSG_RESULT("no")
+  fi
+fi
+
+# Should we use named pthread library ?
+AC_MSG_CHECKING("named thread libs:")
+if test "$with_named_thread" != "no"
+then
+  LIBS="$with_named_thread $LIBS $with_named_thread"
+  CLIENT_THREAD_LIBS="$with_named_thread"
+  with_posix_threads="yes"
+  AC_MSG_RESULT("$with_named_thread")
+else
+  AC_MSG_RESULT("no")
+  # pthread_create is in standard libraries (As in BSDI 3.0)
+  AC_MSG_CHECKING("for pthread_create in -libc");
+  AC_TRY_LINK(
+  [#include <pthread.h>],
+  [ (void) pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],
+  with_posix_threads=yes, with_posix_threads=no)
+  AC_MSG_RESULT("$with_posix_threads")
+  if test "$with_posix_threads" = "no"
+  then
+    AC_MSG_CHECKING("for pthread_create in -lpthread")
+    ac_save_LIBS="$LIBS"
+    LIBS="$LIBS -lpthread"
+    CLIENT_THREAD_LIBS="-lpthread"
+    AC_TRY_LINK(
+    [#include <pthread.h>],
+    [ (void) pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],
+    with_posix_threads=yes, with_posix_threads=no)
+    AC_MSG_RESULT("$with_posix_threads")
+    if test "$with_posix_threads" = "no"
+    then
+      LIBS=" $ac_save_LIBS -lpthreads"
+      CLIENT_THREAD_LIBS="-lpthreads"
+      AC_MSG_CHECKING("for pthread_create in -lpthreads")
+      AC_TRY_LINK(
+      [#include <pthread.h>],
+      [ pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],
+      with_posix_threads=yes, with_posix_threads=no)
+      AC_MSG_RESULT("$with_posix_threads")
+      if test "$with_posix_threads" = "no"
+      then
+        # This is for FreeBSD
+        LIBS="$ac_save_LIBS -pthread"
+        CLIENT_THREAD_LIBS="-pthread"
+        AC_MSG_CHECKING("for pthread_create in -pthread")
+        AC_TRY_LINK(
+        [#include <pthread.h>],
+        [ pthread_create((pthread_t*) 0,(pthread_attr_t*) 0, 0, 0); ],
+        with_posix_threads=yes, with_posix_threads=no)
+        AC_MSG_RESULT("$with_posix_threads")
+      fi
+    fi
+  fi
+fi
+
+#---START: Used in for client configure
+# Must be checked after, because strtok_r may be in -lpthread
+# On AIX strtok_r is in libc_r
+
+my_save_LIBS="$LIBS"
+AC_CHECK_LIB(pthread,strtok_r)
+LIBS="$my_save_LIBS"
+if test "$ac_cv_lib_pthread_strtok_r" = "no"
+then
+  AC_CHECK_LIB(c_r,strtok_r)
+  case "$with_osf32_threads---$target_os" in
+    # Don't keep -lc_r in LIBS; -pthread handles it magically
+    yes---* | *---freebsd* | *---hpux*) LIBS="$my_save_LIBS" ;;
+
+  esac
+  AC_CHECK_FUNCS(strtok_r pthread_init)
+else
+  AC_CHECK_FUNCS(strtok_r)
+fi
+#---END:
+
+# dlopen, dlerror
+case "$with_mysqld_ldflags " in
+
+  *"-all-static "*)
+    # No need to check for dlopen when mysqld is linked with
+    # -all-static as it won't be able to load any functions.
+    # NOTE! It would be better if it was possible to test if dlopen
+    # can be used, but a good way to test it couldn't be found
+
+    ;;
+
+  *)
+    # Check for dlopen, needed for user definable functions
+    # This must be checked after threads on AIX
+    # We only need this for mysqld, not for the clients.
+
+    my_save_LIBS="$LIBS"
+    LIBS=""
+    AC_CHECK_LIB(dl,dlopen)
+    LIBDL=$LIBS
+    LIBS="$my_save_LIBS"
+    AC_SUBST(LIBDL)
+
+    my_save_LIBS="$LIBS"
+    LIBS="$LIBS $LIBDL"
+    AC_CHECK_FUNCS(dlopen dlerror)
+    LIBS="$my_save_LIBS"
+
+    ;;
+esac
+
+
+# System characteristics
+case $SYSTEM_TYPE in
+  *netware*) ;;
+  *)
+AC_SYS_RESTARTABLE_SYSCALLS
+    ;;
+esac
+
+# Build optimized or debug version ?
+# First check for gcc and g++
+if test "$GCC" = "yes"
+then
+  DEBUG_CFLAGS="-g"
+  DEBUG_OPTIMIZE_CC="-O"
+  OPTIMIZE_CFLAGS="$MAX_C_OPTIMIZE"
+else
+  DEBUG_CFLAGS="-g"
+  DEBUG_OPTIMIZE_CC=""
+  case $SYSTEM_TYPE in                               
+    *solaris*)
+      OPTIMIZE_CFLAGS="-O1"
+      ;;
+    *)
+      OPTIMIZE_CFLAGS="-O"
+      ;;
+  esac
+fi
+if test "$GXX" = "yes"
+then
+  DEBUG_CXXFLAGS="-g"
+  DEBUG_OPTIMIZE_CXX="-O"
+  OPTIMIZE_CXXFLAGS="$MAX_CXX_OPTIMIZE"
+else
+  DEBUG_OPTIMIZE_CXX=""
+  case $SYSTEM_TYPE in
+    *solaris*)
+      DEBUG_CXXFLAGS="-g0"
+      OPTIMIZE_CXXFLAGS="-O1"
+      ;;
+    *)
+      DEBUG_CXXFLAGS="-g"
+      OPTIMIZE_CXXFLAGS="-O"
+      ;;
+  esac
+fi
+
+case $SYSTEM_TYPE in
+  *netware*)
+    DEBUG_CFLAGS="-g -DDEBUG -sym internal,codeview4"
+    DEBUG_CXXFLAGS="-g -DDEBUG -sym internal,codeview4"
+    DEBUG_OPTIMIZE_CC="-DDEBUG"
+    DEBUG_OPTIMIZE_CXX="-DDEBUG"
+    OPTIMIZE_CFLAGS="-O3 -DNDEBUG"
+    OPTIMIZE_CXXFLAGS="-O3 -DNDEBUG"
+    ;;
+esac
+
+# If the user specified CFLAGS, we won't add any optimizations
+if test -n "$SAVE_CFLAGS"
+then
+  OPTIMIZE_CFLAGS=""
+  DEBUG_OPTIMIZE_CC=""
+fi
+# Ditto for CXXFLAGS
+if test -n "$SAVE_CXXFLAGS"
+then
+  OPTIMIZE_CXXFLAGS=""
+  DEBUG_OPTIMIZE_CXX=""
+fi
+
+if test "$with_debug" = "yes"
+then
+  # Medium debug.
+  AC_DEFINE([DBUG_ON], [1], [Use libdbug])
+  CFLAGS="$DEBUG_CFLAGS $DEBUG_OPTIMIZE_CC -DSAFE_MUTEX $CFLAGS"
+  CXXFLAGS="$DEBUG_CXXFLAGS $DEBUG_OPTIMIZE_CXX -DSAFE_MUTEX $CXXFLAGS"
+elif test "$with_debug" = "full"
+then
+  # Full debug. Very slow in some cases
+  AC_DEFINE([DBUG_ON], [1], [Use libdbug])
+  CFLAGS="$DEBUG_CFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CFLAGS"
+  CXXFLAGS="$DEBUG_CXXFLAGS -DSAFE_MUTEX -DSAFEMALLOC $CXXFLAGS"
+else
+  # Optimized version. No debug
+  AC_DEFINE([DBUG_OFF], [1], [Don't use libdbug])
+  CFLAGS="$OPTIMIZE_CFLAGS $CFLAGS"
+  CXXFLAGS="$OPTIMIZE_CXXFLAGS $CXXFLAGS"
+fi
+
+AC_ARG_WITH([valgrind],
+  [AS_HELP_STRING([--with-valgrind],
+    [Valgrind instrumentation @<:@default=no@:>@])],
+    [], [with_valgrind=no])
+
+if test "$with_valgrind" != "no"
+then
+  AC_CHECK_HEADERS([valgrind/valgrind.h valgrind/memcheck.h],
+    [AC_DEFINE([HAVE_VALGRIND], [1], [Define for Valgrind support])])
+fi
+
+# Debug Sync Facility. NOTE: depends on 'with_debug'. Must be behind it.
+AC_MSG_CHECKING(if Debug Sync Facility should be enabled.)
+AC_ARG_ENABLE(debug_sync,
+              AS_HELP_STRING([--enable-debug-sync],
+                             [Build a version with Debug Sync Facility]),
+              [ enable_debug_sync=$enableval ],
+              [ enable_debug_sync=$with_debug ])
+
+if test "$enable_debug_sync" != "no"
+then
+  AC_DEFINE([ENABLED_DEBUG_SYNC], [1],
+            [If Debug Sync Facility should be enabled])
+  AC_MSG_RESULT([yes]) 
+else
+  AC_MSG_RESULT([no])
+fi
+
+# If we should allow error injection tests
+AC_ARG_WITH(error-inject,
+    AC_HELP_STRING([--with-error-inject],[Enable error injection in MySQL Server]),
+    [ with_error_inject=$withval ],
+    [ with_error_inject=no ])
+
+if test $with_debug != "no"
+then
+  if test "$with_error_inject" = "yes"
+  then
+    AC_DEFINE([ERROR_INJECT_SUPPORT], [1],
+              [Enable error injection in MySQL Server])
+  fi
+fi
+
+AC_ARG_WITH([fast-mutexes],
+	    AC_HELP_STRING([--with-fast-mutexes], 
+	    [Compile with fast mutexes (default is disabled)]),
+	    [with_fast_mutexes=$withval], [with_fast_mutexes=no])
+
+if test "$with_fast_mutexes" != "no"
+then
+  if test "$with_debug" != "no"
+  then
+    AC_MSG_WARN(['--with-fast-mutexes' ignored when '--with-debug' is given])
+  else
+    AC_DEFINE([MY_PTHREAD_FASTMUTEX], [1], 
+	      [Define to 1 if you want to use fast mutexes])
+  fi
+fi
+
+AC_ARG_WITH([atomic-ops],
+	    AC_HELP_STRING([--with-atomic-ops=rwlocks|smp|up],
+	    [Implement atomic operations using pthread rwlocks or atomic CPU
+             instructions for multi-processor (default) or uniprocessor
+             configuration]), , [with_atomic_ops=smp])
+case "$with_atomic_ops" in
+  "up") AC_DEFINE([MY_ATOMIC_MODE_DUMMY], [1],
+                  [Assume single-CPU mode, no concurrency]) ;;
+  "rwlocks") AC_DEFINE([MY_ATOMIC_MODE_RWLOCKS], [1],
+                  [Use pthread rwlocks for atomic ops]) ;;
+  "smp") ;;
+   *) AC_MSG_ERROR(["$with_atomic_ops" is not a valid value for --with-atomic-ops]) ;;
+esac
+
+AC_CACHE_CHECK([whether the compiler provides atomic builtins],
+               [mysql_cv_gcc_atomic_builtins], [AC_TRY_RUN([
+  int main()
+  {
+    int foo= -10; int bar= 10;
+    long long int foo64= -10; long long int bar64= 10;
+    if (!__sync_fetch_and_add(&foo, bar) || foo)
+      return -1;
+    bar= __sync_lock_test_and_set(&foo, bar);
+    if (bar || foo != 10)
+      return -1;
+    bar= __sync_val_compare_and_swap(&bar, foo, 15);
+    if (bar)
+      return -1;
+    if (!__sync_fetch_and_add(&foo64, bar64) || foo64)
+      return -1;
+    bar64= __sync_lock_test_and_set(&foo64, bar64);
+    if (bar64 || foo64 != 10)
+      return -1;
+    bar64= __sync_val_compare_and_swap(&bar64, foo, 15);
+    if (bar64)
+      return -1;
+    return 0;
+  }
+], [mysql_cv_gcc_atomic_builtins=yes],
+   [mysql_cv_gcc_atomic_builtins=no],
+   [mysql_cv_gcc_atomic_builtins=no])])
+
+if test "x$mysql_cv_gcc_atomic_builtins" = xyes; then
+  AC_DEFINE(HAVE_GCC_ATOMIC_BUILTINS, 1,
+            [Define to 1 if compiler provides atomic builtins.])
+fi
+
+AC_CACHE_CHECK([whether the OS provides atomic_* functions like Solaris],
+               [mysql_cv_solaris_atomic],
+  [AC_RUN_IFELSE(
+     [AC_LANG_PROGRAM(
+        [[
+        #include <atomic.h>
+        ]],
+     [[
+        int foo = -10; int bar = 10;
+        int64_t foo64 = -10; int64_t bar64 = 10;
+        if (atomic_add_int_nv((uint_t *)&foo, bar) || foo)
+          return -1;
+        bar = atomic_swap_uint((uint_t *)&foo, (uint_t)bar);
+        if (bar || foo != 10)
+          return -1;
+        bar = atomic_cas_uint((uint_t *)&bar, (uint_t)foo, 15);
+        if (bar)
+          return -1;
+        if (atomic_add_64_nv((volatile uint64_t *)&foo64, bar64) || foo64)
+          return -1;
+        bar64 = atomic_swap_64((volatile uint64_t *)&foo64, (uint64_t)bar64);
+        if (bar64 || foo64 != 10)
+          return -1;
+        bar64 = atomic_cas_64((volatile uint64_t *)&bar64, (uint_t)foo64, 15);
+        if (bar64)
+          return -1;
+        atomic_or_64((volatile uint64_t *)&bar64, 0);
+        return 0;
+     ]]
+     )],
+   [mysql_cv_solaris_atomic=yes],
+   [mysql_cv_solaris_atomic=no],
+   [mysql_cv_solaris_atomic=no]
+)])
+
+if test "x$mysql_cv_solaris_atomic" = xyes; then
+  AC_DEFINE(HAVE_SOLARIS_ATOMIC, 1,
+            [Define to 1 if OS provides atomic_* functions like Solaris.])
+fi
+
+# Force static compilation to avoid linking problems/get more speed
+AC_ARG_WITH(mysqld-ldflags,
+    [  --with-mysqld-ldflags   Extra linking arguments for mysqld],
+    [MYSQLD_EXTRA_LDFLAGS=$withval],
+    [MYSQLD_EXTRA_LDFLAGS=])
+AC_SUBST(MYSQLD_EXTRA_LDFLAGS)
+
+AC_ARG_WITH(client-ldflags,
+    [  --with-client-ldflags   Extra linking arguments for clients],
+    [CLIENT_EXTRA_LDFLAGS=$withval],
+    [CLIENT_EXTRA_LDFLAGS=])
+AC_SUBST(CLIENT_EXTRA_LDFLAGS)
+
+AC_ARG_WITH(mysqld-libs,
+    [  --with-mysqld-libs   Extra libraries to link with for mysqld],
+    [MYSQLD_EXTRA_LIBS=$withval],
+    [MYSQLD_EXTRA_LIBS=])
+AC_SUBST(MYSQLD_EXTRA_LIBS)
+
+AC_ARG_WITH(lib-ccflags,
+    [  --with-lib-ccflags      Extra CC options for libraries],
+    [LIB_EXTRA_CCFLAGS=$withval],
+    [LIB_EXTRA_CCFLAGS=])
+AC_SUBST(LIB_EXTRA_CCFLAGS)
+
+# Avoid stupid bug on some OS 
+AC_ARG_WITH(low-memory,
+    [  --with-low-memory       Try to use less memory to compile to avoid 
+                          memory limitations.],
+    [with_lowmem=$withval],
+    [with_lowmem=no])
+if test "$with_lowmem" = "yes"
+then
+  if test "$ac_cv_prog_gcc" = "yes" 
+  then 
+    LM_CFLAGS="-fno-inline"
+  else
+    LM_CFLAGS="-O0"
+  fi
+else
+  LM_CFLAGS=""
+fi
+AC_SUBST(LM_CFLAGS)
+
+AC_ARG_WITH(comment,
+    [  --with-comment          Comment about compilation environment.],
+    [with_comment=$withval],
+    [with_comment=no])
+if test "$with_comment" != "no"
+then
+  COMPILATION_COMMENT=$with_comment
+else
+  COMPILATION_COMMENT="Source distribution"
+fi
+AC_SUBST(COMPILATION_COMMENT)
+
+AC_MSG_CHECKING("need of special linking flags")
+if test "$TARGET_LINUX" = "true" -a "$ac_cv_prog_gcc" = "yes" -a "$all_is_static" != "yes"
+then
+  LDFLAGS="$LDFLAGS -rdynamic"
+  AC_MSG_RESULT("-rdynamic")
+else
+  case "$SYSTEM_TYPE$with_mysqld_ldflags " in
+  *freebsd*"-all-static "*|*dragonfly*"-all-static "*)
+    AC_MSG_RESULT("none")
+    ;;
+  *freebsd*|*dragonfly*)
+    MYSQLD_EXTRA_LDFLAGS="$MYSQLD_EXTRA_LDFLAGS -export-dynamic"
+    AC_MSG_RESULT("-export-dynamic")
+    ;;
+  *)
+    AC_MSG_RESULT("none")
+    ;;
+  esac
+fi
+
+dnl Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_C_INLINE
+AC_TYPE_OFF_T
+AC_STRUCT_ST_RDEV
+AC_HEADER_TIME
+AC_STRUCT_TM
+MYSQL_NEEDS_MYSYS_NEW
+# AC_CHECK_SIZEOF return 0 when it does not find the size of a
+# type. We want a error instead.
+AC_CHECK_SIZEOF(char, 1)
+if test "$ac_cv_sizeof_char" -eq 0
+then
+  AC_MSG_ERROR([No size for char type.
+A likely cause for this could be that there isn't any
+static libraries installed. You can verify this by checking if you have libm.a
+in /lib, /usr/lib or some other standard place.  If this is the problem,
+install the static libraries and try again.  If this isn't the problem,
+examine config.log for possible errors.  If you want to report this, use
+'scripts/mysqlbug' and include at least the last 20 rows from config.log!])
+fi
+AC_CHECK_SIZEOF(char*, 4)
+AC_CHECK_SIZEOF(short, 2)
+AC_CHECK_SIZEOF(int, 4)
+if test "$ac_cv_sizeof_int" -eq 0
+then
+  AC_MSG_ERROR("No size for int type.")
+fi
+AC_CHECK_SIZEOF(long, 4)
+if test "$ac_cv_sizeof_long" -eq 0
+then
+  AC_MSG_ERROR("No size for long type.")
+fi
+AC_CHECK_SIZEOF(long long, 8)
+if test "$ac_cv_sizeof_long_long" -eq 0
+then
+  AC_MSG_ERROR("MySQL needs a long long type.")
+fi
+# off_t is not a builtin type
+AC_CHECK_SIZEOF(off_t, 4)
+if test "$ac_cv_sizeof_off_t" -eq 0
+then
+  AC_MSG_ERROR("MySQL needs a off_t type.")
+fi
+
+dnl
+dnl check if time_t is unsigned
+dnl
+
+MYSQL_CHECK_TIME_T
+
+dnl
+dnl check size of time_t
+dnl
+
+AC_CHECK_SIZEOF(time_t, 8)
+if test "$ac_cv_sizeof_time_t" -eq 0
+then
+  AC_MSG_ERROR("MySQL needs a time_t type.")
+fi
+
+# do we need #pragma interface/#pragma implementation ?
+# yes if it's gcc 2.x, and not icc pretending to be gcc, and not cygwin
+AC_MSG_CHECKING(the need for @%:@pragma interface/implementation)
+# instead of trying to match SYSTEM_TYPE and CC_VERSION (that doesn't
+# follow any standard), we'll use well-defined preprocessor macros:
+AC_TRY_CPP([
+#if !defined(__CYGWIN__) && !defined(__INTEL_COMPILER) && defined(__GNUC__) && (__GNUC__ < 3)
+#error USE_PRAGMA_IMPLEMENTATION
+#endif
+],AC_MSG_RESULT(no) ,AC_MSG_RESULT(yes) ; CXXFLAGS="$CXXFLAGS -DUSE_PRAGMA_IMPLEMENTATION")
+
+# This always gives a warning. Ignore it unless you are cross compiling
+AC_C_BIGENDIAN
+#---START: Used in for client configure
+# Check base type of last arg to accept
+MYSQL_TYPE_ACCEPT
+#---END:
+# Figure out what type of struct rlimit to use with setrlimit
+MYSQL_TYPE_STRUCT_RLIMIT
+# Find where the stack goes
+MYSQL_STACK_DIRECTION
+# We want to skip alloca on irix unconditionally. It may work on some version..
+MYSQL_FUNC_ALLOCA
+# Do struct timespec have members tv_sec or ts_sec
+MYSQL_TIMESPEC_TS
+# Do we have the tzname variable
+MYSQL_TZNAME
+# Do the c++ compiler have a bool type
+MYSQL_CXX_BOOL
+# Check some common bugs with gcc 2.8.# on sparc
+case $SYSTEM_TYPE in
+  *netware*) ;;
+  *)
+    MYSQL_CHECK_LONGLONG_TO_FLOAT
+    if test "$ac_cv_conv_longlong_to_float" != "yes"
+    then
+      AC_MSG_ERROR([Your compiler cannot convert a longlong value to a float!
+ If you are using gcc 2.8.# you should upgrade to egcs 1.0.3 or newer and try
+    again])
+    fi
+    ;;
+esac
+AC_CHECK_TYPES([sigset_t, off_t], [], [], [#include <sys/types.h>])
+AC_CHECK_TYPES([size_t], [], [], [#include <stdio.h>])
+AC_CHECK_TYPES([u_int32_t])
+
+MYSQL_PTHREAD_YIELD
+
+######################################################################
+# For readline/libedit (We simply move the mimimum amount of stuff from
+# the readline/libedit configure.in here)
+
+dnl Checks for header files.
+AC_CHECK_HEADERS(malloc.h sys/cdefs.h)
+
+dnl Checks for library functions.
+AC_FUNC_ALLOCA
+AC_PROG_GCC_TRADITIONAL
+AC_TYPE_SIGNAL
+AC_CHECK_FUNCS(re_comp regcomp strdup)
+
+dnl Sun compilers have their own vis.h that is about something
+dnl totally different. So, not to change the libedit source, we
+dnl do some additional checks before we define HAVE_VIS_H.
+AC_CHECK_HEADER(vis.h,
+  [AC_CHECK_FUNC(strvis,
+    [AC_DEFINE([HAVE_VIS_H], [1],[Found vis.h and the strvis() function])])])
+
+AC_CHECK_FUNCS(strlcat strlcpy)
+AC_CHECK_FUNCS(issetugid getuid geteuid getgid getegid)
+AC_CHECK_FUNCS(fgetln)
+AC_CHECK_FUNCS(getline flockfile)
+
+# from old readline settting:
+
+MAKE_SHELL=/bin/sh
+AC_SUBST(MAKE_SHELL)
+
+# Already-done: stdlib.h string.h unistd.h termios.h
+AC_CHECK_HEADERS(varargs.h stdarg.h dirent.h locale.h ndir.h sys/dir.h \
+ sys/file.h sys/ndir.h sys/ptem.h sys/pte.h sys/select.h sys/stream.h \
+ sys/mman.h curses.h termcap.h termio.h termbits.h asm/termbits.h grp.h \
+paths.h semaphore.h)
+
+# Already-done: strcasecmp
+AC_CHECK_FUNCS(lstat putenv select setenv setlocale strcoll tcgetattr)
+
+AC_STAT_MACROS_BROKEN
+MYSQL_SIGNAL_CHECK
+MYSQL_CHECK_GETPW_FUNCS
+MYSQL_HAVE_TIOCGWINSZ
+MYSQL_HAVE_FIONREAD
+MYSQL_HAVE_TIOCSTAT
+MYSQL_STRUCT_DIRENT_D_INO
+MYSQL_STRUCT_DIRENT_D_NAMLEN
+MYSQL_TYPE_SIGHANDLER
+MYSQL_CHECK_MULTIBYTE
+if test "$with_named_curses" = "no"
+then
+  MYSQL_CHECK_LIB_TERMCAP
+else
+  TERMCAP_LIB="$with_named_curses"
+fi
+AC_SUBST(TERMCAP_LIB)
+
+# Check if the termcap function 'tgoto' is already declared in
+# system header files or if it need to be declared locally
+AC_CHECK_DECLS(tgoto,,,[
+#ifdef HAVE_CURSES_H
+# include <curses.h>
+#elif HAVE_NCURSES_H
+# include <ncurses.h>
+#endif
+#ifdef HAVE_TERM_H
+# include <term.h>
+#endif
+])
+
+LIBEDIT_LOBJECTS=""
+AC_CHECK_FUNC(strunvis, ,[LIBEDIT_LOBJECTS="$LIBEDIT_LOBJECTS unvis.o"])
+AC_CHECK_FUNC(strvis,   ,[LIBEDIT_LOBJECTS="$LIBEDIT_LOBJECTS vis.o"])
+AC_CHECK_FUNC(strlcpy,  ,[LIBEDIT_LOBJECTS="$LIBEDIT_LOBJECTS strlcpy.o"])
+AC_CHECK_FUNC(strlcat,  ,[LIBEDIT_LOBJECTS="$LIBEDIT_LOBJECTS strlcat.o"])
+AC_CHECK_FUNC(fgetln,   ,[LIBEDIT_LOBJECTS="$LIBEDIT_LOBJECTS fgetln.o"])
+AC_SUBST(LIBEDIT_LOBJECTS)
+enable_readline="yes"
+
+# End of readline/libedit stuff
+#########################################################################
+
+dnl Checks for library functions.
+
+#
+# The following code disables intrinsic function support while we test for
+# library functions.  This is to avoid configure problems with Intel ecc
+# compiler
+
+ORG_CFLAGS="$CFLAGS"
+if test "$GCC" != "yes"; then
+  AC_SYS_COMPILER_FLAG(-nolib_inline,nolib_inline,CFLAGS,[],[])
+fi
+
+#AC_FUNC_MMAP
+AC_TYPE_SIGNAL
+MYSQL_TYPE_QSORT
+AC_FUNC_UTIME_NULL
+AC_FUNC_VPRINTF
+
+AC_CHECK_DECLS([fdatasync, bzero])
+
+AC_CHECK_FUNCS(alarm bfill bmove bsearch bzero \
+  chsize cuserid fchmod fcntl \
+  fconvert fdatasync fesetround finite fpresetsticky fpsetmask fsync ftruncate \
+  getcwd gethostbyaddr_r gethostbyname_r getpass getpassphrase getpwnam \
+  getpwuid getrlimit getrusage getwd index initgroups isnan \
+  localtime_r gethrtime gmtime_r \
+  locking longjmp lrand48 madvise mallinfo memcpy memmove \
+  mkstemp mlockall perror poll pread pthread_attr_create mmap mmap64 getpagesize \
+  pthread_attr_getstacksize pthread_attr_setprio pthread_attr_setschedparam \
+  pthread_attr_setstacksize pthread_condattr_create pthread_getsequence_np \
+  pthread_key_delete pthread_rwlock_rdlock pthread_setprio \
+  pthread_setprio_np pthread_setschedparam pthread_sigmask readlink \
+  realpath rename rint rwlock_init setupterm \
+  shmget shmat shmdt shmctl sigaction sigemptyset sigaddset \
+  sighold sigset sigthreadmask port_create sleep \
+  snprintf socket strsep stpcpy strcasecmp strerror strsignal strnlen strpbrk strstr \
+  strtol strtoll strtoul strtoull tell tempnam thr_setconcurrency vidattr \
+  posix_fallocate backtrace backtrace_symbols backtrace_symbols_fd printstack \
+  fedisableexcept)
+
+#
+#
+#
+# The following change can be safely null-merged to 5.5
+# since configure.cmake in 5.5 does the same check
+AC_SEARCH_LIBS(clock_gettime, rt, LIBRT="-lrt")
+case "$target" in
+ *-*-aix4* | *-*-sco*)
+	# (grr) aix 4.3 has a stub for clock_gettime, (returning ENOSYS)
+	# and using AC_TRY_RUN is hard when cross-compiling
+	# We also disable for SCO for the time being, the headers for the
+	# thread library we use conflicts with other headers.
+    ;;
+ *) AC_CHECK_FUNCS(clock_gettime)
+    ;;
+esac
+
+case "$mysql_cv_sys_os" in
+ OS400) # i5/OS (OS/400) emits a SIGILL (Function not implemented) when
+        # unsupported priority values are passed to pthread_setschedprio.
+        # Since the only supported value is 1, treat it as inexistent.
+    ;;
+ SunOS) # Bug#42599 error: `pthread_setschedprio' was not declared in this scope
+        # In some installations, the pthread.h header used by GCC does not
+        # declare the pthread_setscheprio prototype, but the function is
+        # implemented. Since the function is used in C++ code, ensure that
+        # the function prototype is present.
+     AC_MSG_CHECKING([whether pthread_setschedprio is declared])
+     AC_LANG_PUSH([C++])
+     AC_COMPILE_IFELSE([
+       AC_LANG_PROGRAM([#include <pthread.h>],
+                      [(void)(pthread_setschedprio);])],
+       [ac_cv_func_pthread_setschedprio=yes],
+       [ac_cv_func_pthread_setschedprio=no])
+     AC_LANG_POP([C++])
+     AC_MSG_RESULT([$ac_cv_func_pthread_setschedprio])
+     if test "$ac_cv_func_pthread_setschedprio" = yes; then
+       AC_DEFINE(HAVE_PTHREAD_SETSCHEDPRIO, 1,
+                 [Define to 1 if you have the `pthread_setschedprio' function.])
+     fi
+    ;;
+ *) AC_CHECK_FUNCS(pthread_setschedprio)
+    ;;
+esac
+
+# Check that isinf() is available in math.h and can be used in both C and C++ 
+# code
+AC_MSG_CHECKING(for isinf in <math.h>)
+AC_TRY_LINK([#include <math.h>], [float f = 0.0; int r = isinf(f); return r],
+  AC_MSG_RESULT(yes)
+  AC_MSG_CHECKING(whether isinf() is safe to use in C code)
+  AC_TRY_RUN([
+#include <math.h>
+int main()
+{
+  double a= 10.0;
+  double b= 1e308;
+
+  return !isinf(a * b);
+}
+],
+  [AC_MSG_RESULT(yes)],
+  [AC_MSG_RESULT(no)
+   AC_DEFINE([HAVE_BROKEN_ISINF], [1],
+             [Define to 1 if isinf() uses 80-bit register for intermediate values])
+  ],
+  [
+# Let's be optimistic when cross-compiling, since the only compiler known
+# to be affected by this isinf() bug is GCC 4.3 on 32-bit x86.
+   AC_MSG_RESULT([[cross-compiling, assuming 'yes']])
+  ])
+  AC_MSG_CHECKING(whether isinf() can be used in C++ code)
+  AC_LANG_SAVE
+  AC_LANG_CPLUSPLUS
+  AC_TRY_LINK([#include <math.h>], [float f = 0.0; int r = isinf(f); return r],
+    AC_MSG_RESULT(yes)
+    AC_DEFINE(HAVE_ISINF, [1], [isinf() macro or function]),
+    AC_MSG_RESULT(no))
+  AC_LANG_RESTORE,
+  AC_MSG_RESULT(no))
+ 
+CFLAGS="$ORG_CFLAGS"
+
+# Sanity check: We chould not have any fseeko symbol unless
+# large_file_support=yes
+AC_CHECK_FUNC(fseeko,
+[if test "$large_file_support" = no -a "$TARGET_LINUX" = "true";
+then
+  AC_MSG_ERROR("Found fseeko symbol but large_file_support is not enabled!")
+fi]
+)
+
+# Check definition of gethostbyaddr_r (glibc2 defines this with 8 arguments)
+ac_save_CXXFLAGS="$CXXFLAGS"
+AC_CACHE_CHECK([style of gethost* routines], mysql_cv_gethost_style,
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+
+# Test whether madvise() is declared in C++ code -- it is not on some
+# systems, such as Solaris
+AC_CHECK_DECLS(madvise, [], [], [#if HAVE_SYS_MMAN_H
+#include <sys/types.h>
+#include <sys/mman.h>
+#endif])
+
+# Do not treat warnings as errors if we are linking against other libc
+# this is to work around gcc not being permissive on non-system includes
+# with respect to ANSI C++
+# We also remove the -fbranch-probabilities option as this will give warnings
+# about not profiled code, which confuses configure
+# We also must remove -W and -Wcheck which on icc produces warnings that
+# we don't want to catch with -Werror
+
+if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
+then
+  CXXFLAGS=`echo "$CXXFLAGS -Werror" | sed -e 's/-fbranch-probabilities//; s/-Wall//; s/-ansi//; s/-pedantic//; s/-Wcheck//'`
+fi
+
+AC_TRY_COMPILE(
+[#undef inline
+#if !defined(SCO) && !defined(__osf__) && !defined(_REENTRANT)
+#define _REENTRANT
+#endif
+#include <pthread.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>],
+[int skr;
+ struct hostent *foo = gethostbyaddr_r((const char *) 0,
+  0, 0, (struct hostent *) 0, (char *) NULL,  0, &skr); return (foo == 0);],
+mysql_cv_gethost_style=solaris, mysql_cv_gethost_style=other))
+AC_LANG_RESTORE
+CXXFLAGS="$ac_save_CXXFLAGS"
+if test "$mysql_cv_gethost_style" = "solaris"
+then
+  AC_DEFINE([HAVE_SOLARIS_STYLE_GETHOST], [1],
+            [Solaris define gethostbyaddr_r with 7 arguments. glibc2 defines this with 8 arguments])
+fi
+
+#---START: Used in for client configure
+
+# Check definition of gethostbyname_r (glibc2.0.100 is different from Solaris)
+ac_save_CXXFLAGS="$CXXFLAGS"
+AC_CACHE_CHECK([style of gethostbyname_r routines], mysql_cv_gethostbyname_style,
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+if test "$ac_cv_prog_gxx" = "yes" -a "$with_other_libc" = "no"
+then
+  CXXFLAGS=`echo "$CXXFLAGS -Werror" | sed -e 's/-fbranch-probabilities//; s/-Wall//; s/-ansi//; s/-pedantic//; s/-Wcheck//'`
+fi
+AC_TRY_COMPILE(
+[#undef inline
+#if !defined(SCO) && !defined(__osf__) && !defined(_REENTRANT)
+#define _REENTRANT
+#endif
+#include <pthread.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>],
+[int skr;
+
+ skr = gethostbyname_r((const char *) 0,
+  (struct hostent*) 0, (char*) 0, 0, (struct hostent **) 0, &skr);],
+mysql_cv_gethostbyname_style=glibc2, mysql_cv_gethostbyname_style=other))
+AC_LANG_RESTORE
+CXXFLAGS="$ac_save_CXXFLAGS"
+if test "$mysql_cv_gethostbyname_style" = "glibc2"
+then
+  AC_DEFINE([HAVE_GETHOSTBYNAME_R_GLIBC2_STYLE], [1],
+            [Solaris define gethostbyname_r with 5 arguments. glibc2 defines this with 6 arguments])
+fi
+