Merge from mysql-5.1.68-release

configure.in

@@ -22,7 +22,7 @@ AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE([1.9 tar-ustar])
 AC_PROG_LIBTOOL
 
-AM_CONFIG_HEADER([include/config.h])
+AC_CONFIG_HEADERS([include/config.h])
 
 # Request support for automake silent-rules if available.
 # Default to verbose output. One can use the configure-time
@@ -269,6 +269,31 @@ 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"

libmysqld/Makefile.am

@@ -90,7 +90,7 @@ storageobjects = @condition_dependent_plugin_objects@
 storagesourceslinks = @condition_dependent_plugin_links@
 
 # automake misses these
-sql_yacc.cc sql_yacc.h: $(top_srcdir)/sql/sql_yacc.yy
+sql_yacc.cc sql_yacc.$(YACC_HEXT): $(top_srcdir)/sql/sql_yacc.yy
 
 # The following libraries should be included in libmysqld.a
 INC_LIB=	$(top_builddir)/regex/libregex.a \

sql/.cvsignore

@@ -9,4 +9,5 @@ mysqlbinlog
 mysqlbinlog
 mysqld
 sql_yacc.cc
+sql_yacc.hh
 sql_yacc.h

sql/Makefile.am

@@ -146,7 +146,7 @@ DEFS =			-DMYSQL_SERVER \
 			-DHAVE_EVENT_SCHEDULER \
 			@DEFS@
 
-BUILT_MAINT_SRC =	sql_yacc.cc sql_yacc.h
+BUILT_MAINT_SRC =	sql_yacc.cc sql_yacc.$(YACC_HEXT)
 BUILT_SOURCES =		$(BUILT_MAINT_SRC) lex_hash.h link_sources
 EXTRA_DIST =		udf_example.c udf_example.def $(BUILT_MAINT_SRC) \
 			nt_servc.cc nt_servc.h \

sql/sql_lex.h

@@ -47,7 +47,11 @@ class Event_parse_data;
 #else
 #include "lex_symbol.h"
 #if MYSQL_LEX
-#include "sql_yacc.h"
+#  if YACC_HEXT_HH
+#    include "sql_yacc.hh"
+#  else
+#    include "sql_yacc.h"
+#  endif
 #define LEX_YYSTYPE YYSTYPE *
 #else
 #define LEX_YYSTYPE void *