* mysql: added patches

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6844 33e552b5-05e3-0310-8538-816dae2090ed

6 files changed, 289 insertions, 0 deletions

diff --git a/patches/mysql-5.1.14-beta/generic/mysql-5.0.26_autoreconf.diff.bz2 b/patches/mysql-5.1.14-beta/generic/mysql-5.0.26_autoreconf.diff.bz2
new file mode 100644
index 000000000..b0eee6484
--- /dev/null
+++ b/patches/mysql-5.1.14-beta/generic/mysql-5.0.26_autoreconf.diff.bz2
diff --git a/patches/mysql-5.1.14-beta/generic/mysql-5.0.26_comp_err_gen_lex_hash.diff b/patches/mysql-5.1.14-beta/generic/mysql-5.0.26_comp_err_gen_lex_hash.diff
new file mode 100644
index 000000000..c58d25716
--- /dev/null
+++ b/patches/mysql-5.1.14-beta/generic/mysql-5.0.26_comp_err_gen_lex_hash.diff
@@ -0,0 +1,74 @@
+Index: extra/Makefile.am
+===================================================================
+--- extra/Makefile.am.orig
++++ extra/Makefile.am
+@@ -25,6 +25,19 @@ pkginclude_HEADERS=	$(BUILT_SOURCES)
+ DISTCLEANFILES =	$(BUILT_SOURCES)
+ SUBDIRS =		@yassl_dir@
+ 
++# FIXME: RSC: build for host
++#
++# if CROSS_COMPILING
++# comp_err=$(COMP_ERR)
++# else
++# comp_err=$(top_builddir)/extra/comp_err$(EXEEXT)
++# endif
++# ...
++# $(top_builddir)/include/mysqld_error.h: comp_err$(EXEEXT)
++#       $(comp_err) \
++#       --charset=$(top_srcdir)/sql/share/charsets \
++#
++
+ # This will build mysqld_error.h, mysqld_ername.h and sql_state.h
+ # NOTE Built files should depend on their sources to avoid
+ # the built files being rebuilt in source dist
+Index: configure.in
+===================================================================
+--- configure.in.orig
++++ configure.in
+@@ -756,6 +756,26 @@ then
+   )
+ fi
+ 
++dnl ******************************************************************
++dnl *** Look for comp_err & gen_lex_hash if we are cross-compiling ***
++dnl ******************************************************************
++
++AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
++
++if test $cross_compiling = yes; then
++  AC_PATH_PROG(COMP_ERR, comp_err, no)
++  if test x$COMP_ERR = xno; then
++    AC_MSG_ERROR(Could not find comp_err in your PATH)
++  fi
++fi
++
++if test $cross_compiling = yes; then
++  AC_PATH_PROG(GEN_LEX_HASH, gen_lex_hash, no)
++  if test x$GEN_LEX_HASH = xno; then
++    AC_MSG_ERROR(Could not find gen_lex_hash in your PATH)
++  fi
++fi
++
+ #--------------------------------------------------------------------
+ # Check for TCP wrapper support
+ #--------------------------------------------------------------------
+Index: sql/Makefile.am
+===================================================================
+--- sql/Makefile.am.orig
++++ sql/Makefile.am
+@@ -168,8 +168,13 @@ sql_yacc.o:	sql_yacc.cc sql_yacc.h $(HEA
+ # FIXME seems like now "lex_hash.h" differs depending on configure
+ # flags, so can't pregenerate and include in source TAR. Revert to
+ # dist pregenerated if this changes, so the file doesn't differ.
++if CROSS_COMPILING
++gen_lex_hash=$(GEN_LEX_HASH)
++else
++gen_lex_hash=$(top_builddir)/sql/gen_lex_hash$(EXEEXT)
++endif
+ lex_hash.h:	gen_lex_hash$(EXEEXT)
+-		./gen_lex_hash$(EXEEXT) > $@
++		$(gen_lex_hash) > $@
+ 
+ # the following three should eventually be moved out of this directory
+ ha_ndbcluster.o:ha_ndbcluster.cc ha_ndbcluster.h
diff --git a/patches/mysql-5.1.14-beta/generic/mysql-5.0.26_configure.in b/patches/mysql-5.1.14-beta/generic/mysql-5.0.26_configure.in
new file mode 100644
index 000000000..084e03d84
--- /dev/null
+++ b/patches/mysql-5.1.14-beta/generic/mysql-5.0.26_configure.in
@@ -0,0 +1,133 @@
+Index: configure.in
+===================================================================
+--- configure.in.orig
++++ configure.in
+@@ -77,6 +77,7 @@ BASE_MACHINE_TYPE=$MACHINE_TYPE
+ case $MACHINE_TYPE in
+   i?86) BASE_MACHINE_TYPE=i386 ;;
+ esac
++AC_SUBST(CC_FOR_BUILD)
+ 
+ # Save some variables and the command line options for mysqlbug
+ SAVE_ASFLAGS="$ASFLAGS"
+@@ -230,33 +231,46 @@ case $SYSTEM_TYPE in
+     AC_DEFINE(SPRINTF_RETURNS_INT, [1]) AC_MSG_RESULT("int")
+     ;;
+   *)
+-AC_TRY_RUN([
+-  int main()
+-    {
+-      char* s = "hello";
+-      char buf[6];
+-      if((int)sprintf(buf, s) == strlen(s))
+-	return 0;
+-      
+-      return -1;
+-     }
+-   ],
+-   [AC_DEFINE(SPRINTF_RETURNS_INT, [1], [POSIX sprintf])
+-   AC_MSG_RESULT("int")],
+-   [AC_TRY_RUN([
+- int main()
+-   {
+-     char* s = "hello";
+-     char buf[6];
+-     if((char*)sprintf(buf,s) == buf + strlen(s))
+-       return 0;
+-     return -1;
+-   }           ],
+-               [AC_DEFINE(SPRINTF_RETURNS_PTR, [1], [Broken sprintf])
+-                AC_MSG_RESULT("ptr")],
+-               [AC_DEFINE(SPRINTF_RETURNS_GARBAGE, [1], [Broken sprintf])
+-                AC_MSG_RESULT("garbage")])
+-   ])
++  AC_RUN_IFELSE([
++    int main()
++      {
++        char* s = "hello";
++        char buf[6];
++        if((int)sprintf(buf, s) == strlen(s))
++  	  return 0;
++        return -1;
++       }
++    ],
++    [
++      AC_DEFINE(SPRINTF_RETURNS_INT, [1], [POSIX sprintf])
++      AC_MSG_RESULT("int")
++    ],
++    [
++      AC_TRY_RUN([
++        int main()
++          {
++            char* s = "hello";
++            char buf[6];
++            if((char*)sprintf(buf,s) == buf + strlen(s))
++              return 0;
++            return -1;
++          }
++      ],
++      [
++        AC_DEFINE(SPRINTF_RETURNS_PTR, [1], [Broken sprintf])
++        AC_MSG_RESULT("ptr")
++      ],
++      [
++        AC_DEFINE(SPRINTF_RETURNS_GARBAGE, [1], [Broken sprintf])
++        AC_MSG_RESULT("garbage")
++      ]
++      )
++    ],
++    [
++      AC_DEFINE(SPRINTF_RETURNS_INT, [1], [POSIX sprintf])
++      AC_MSG_RESULT("crosscompiling - assuming int")
++    ]
++    )
+     ;;
+ esac
+ 
+@@ -1487,14 +1501,6 @@ case "$with_mysqld_ldflags " in
+ 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 "$ac_cv_prog_gcc" = "yes"
+@@ -1749,16 +1755,6 @@ MYSQL_TIMESPEC_TS
+ MYSQL_TZNAME
+ # Do the c++ compiler have a bool type
+ MYSQL_CXX_BOOL
+-# Check some common bugs with gcc 2.8.# on sparc
+-if ! ( expr "$SYSTEM_TYPE" : ".*netware.*" > /dev/null ); then
+-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
+-fi
+ 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])
+@@ -2154,6 +2150,14 @@ AC_MSG_RESULT("$netinet_inc")
+ # Check for requested features
+ #--------------------------------------------------------------------
+ 
++AC_ARG_WITH(build-mysql,
++    AS_HELP_STRING([--with-build-mysql],[For cross compilation: path to
++    mysql which was compiled for the 'build' system.]),
++    [ BUILD_MYSQL_DIR=${withval} ],
++    [ BUILD_MYSQL_DIR="\$(top_builddir)" ]
++)
++AC_SUBST(BUILD_MYSQL_DIR)
++
+ MYSQL_CHECK_BIG_TABLES
+ MYSQL_CHECK_MAX_INDEXES
+ MYSQL_CHECK_REPLICATION
diff --git a/patches/mysql-5.1.14-beta/generic/mysql-5.0.26_factorial.diff b/patches/mysql-5.1.14-beta/generic/mysql-5.0.26_factorial.diff
new file mode 100644
index 000000000..7c90fde0b
--- /dev/null
+++ b/patches/mysql-5.1.14-beta/generic/mysql-5.0.26_factorial.diff
@@ -0,0 +1,42 @@
+Index: dbug/Makefile.am
+===================================================================
+--- dbug/Makefile.am.orig
++++ dbug/Makefile.am
+@@ -29,6 +29,12 @@ NROFF_INC =             example1.r examp
+                         output4.r output5.r
+ CLEANFILES =            $(NROFF_INC) user.t user.ps
+ 
++if CROSS_COMPILING
++factorial=$(FACTORIAL)
++else
++factorial=$(top_builddir)/dbug/factorial$(EXEEXT)
++endif
++
+ 
+ # Must be linked with libs that are not compiled yet
+ noinst_PROGRAMS =       factorial dbug_analyze
+@@ -44,19 +50,19 @@ user.ps:	user.r $(NROFF_INC)
+ 		-groff -mm user.r > $@
+ 
+ output1.r:      factorial
+-		./factorial 1 2 3 4 5 | cat > $@
++		$(factorial) 1 2 3 4 5 | cat > $@
+ 
+ output2.r:      factorial
+-		./factorial -\#t:o 2 3 | cat >$@
++		$(factorial) -\#t:o 2 3 | cat >$@
+ 
+ output3.r:      factorial
+-		./factorial -\#d:t:o 3 | cat >$@
++		$(factorial) -\#d:t:o 3 | cat >$@
+ 
+ output4.r:      factorial
+-		./factorial -\#d,result:o 4 | cat >$@
++		$(factorial) -\#d,result:o 4 | cat >$@
+ 
+ output5.r:      factorial
+-		./factorial -\#d:f,factorial:F:L:o 3 | cat >$@
++		$(factorial) -\#d:f,factorial:F:L:o 3 | cat >$@
+ .c.r:
+ 		@RM@ -f $@
+ 		@SED@ -e 's!\\!\\\\!g' $< > $@
diff --git a/patches/mysql-5.1.14-beta/generic/mysql-5.1.14-beta-query_cache.diff b/patches/mysql-5.1.14-beta/generic/mysql-5.1.14-beta-query_cache.diff
new file mode 100644
index 000000000..0dcb3612d
--- /dev/null
+++ b/patches/mysql-5.1.14-beta/generic/mysql-5.1.14-beta-query_cache.diff
@@ -0,0 +1,35 @@
+From: 'Hartmut&nbsp;Holzgraefe'Date: December 14 2006 6:07pm
+Subject: bk commit into 5.1 tree (hartmut:1.2359) BUG#25075
+
+Below is the list of changes that have just been committed into a local
+5.1 repository of hartmut. When hartmut does a push these changes will
+be propagated to the main repository and, within 24 hours after the
+push, to the public repository.
+For information on how to access the public repository
+see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html
+
+ChangeSet@stripped, 2006-12-14 18:06:48+01:00, hartmut@stripped +1 -0
+  Don't init query cache if its not compiled in (Bug #25075)
+
+  sql/sql_class.cc@stripped, 2006-12-14 18:06:43+01:00, hartmut@stripped +2 -0
+    Don't init query cache if its not compiled in (Bug #25075)
+
+# This is a BitKeeper patch.  What follows are the unified diffs for the
+# set of deltas contained in the patch.  The rest of the patch, the part
+# that BitKeeper cares about, is below these diffs.
+# User:	hartmut
+# Host:	linux.site
+# Root:	/home/hartmut/projects/mysql/dev/5.1
+
+--- 1.304/sql/sql_class.cc	2006-12-14 18:07:00 +01:00
++++ 1.305/sql/sql_class.cc	2006-12-14 18:07:00 +01:00
+@@ -262,7 +262,9 @@
+ #endif
+   client_capabilities= 0;                       // minimalistic client
+   net.last_error[0]=0;                          // If error on boot
++#ifdef HAVE_QUERY_CACHE
+   query_cache_init_query(&net);                 // If error on boot
++#endif
+   ull=0;
+   system_thread= NON_SYSTEM_THREAD;
+   cleanup_done= abort_on_warning= no_warnings_for_error= 0;
diff --git a/patches/mysql-5.1.14-beta/generic/series b/patches/mysql-5.1.14-beta/generic/series
new file mode 100644
index 000000000..a4e80863c
--- /dev/null
+++ b/patches/mysql-5.1.14-beta/generic/series
@@ -0,0 +1,5 @@
+mysql-5.0.26_configure.in -p0
+mysql-5.0.26_comp_err_gen_lex_hash.diff -p0
+mysql-5.0.26_factorial.diff -p0
+mysql-5.1.14-beta-query_cache.diff
+mysql-5.0.26_autoreconf.diff.bz2 -p0