mysql 5.1, clean old stuff

10 files changed, 1 insertions, 227 deletions

diff --git a/filter-requires-mysql.sh b/filter-requires-mysql.sh
index bce04c6..d435062 100755
--- a/filter-requires-mysql.sh
+++ b/filter-requires-mysql.sh
@@ -1,5 +1,3 @@
 #!/bin/sh
 
-/usr/lib/rpm/perl.req $* | \
-    grep -v -e "perl(th" \
-    -e "perl(lib::mtr" -e "perl(lib::v1/mtr" -e "perl(mtr"
+/usr/lib/rpm/perl.req $* | grep -v -e "perl(th" -e "perl(lib::mtr" -e "perl(mtr"
diff --git a/mysql-5.5-abi.patch b/mysql-5.5-abi.patch
deleted file mode 100644
index 871a9b4..0000000
--- a/mysql-5.5-abi.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mysql-5.5.7-rc/Makefile.am.orig	2010-11-10 17:13:07.506287855 +0100
-+++ mysql-5.5.7-rc/Makefile.am	2010-11-10 17:13:27.982746445 +0100
-@@ -269,7 +269,6 @@
- 			$(top_srcdir)/include/mysql.h \
- 			$(top_srcdir)/include/mysql/psi/psi_abi_v1.h \
- 			$(top_srcdir)/include/mysql/psi/psi_abi_v2.h \
--                        $(top_srcdir)/include/mysql/client_plugin.h \
-                         $(top_srcdir)/include/mysql/plugin_auth.h
- 
- #
diff --git a/mysql-5.5-layout.patch b/mysql-5.5-layout.patch
deleted file mode 100644
index 503fda2..0000000
--- a/mysql-5.5-layout.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- mysql-5.5.8/cmake/install_layout.cmake.layout	2010-12-03 18:58:26.000000000 +0100
-+++ mysql-5.5.8/cmake/install_layout.cmake	2010-12-22 18:57:31.823379680 +0100
-@@ -127,14 +127,15 @@
- # RPM layout
- #
- SET(INSTALL_BINDIR_RPM                  "bin")
--SET(INSTALL_SBINDIR_RPM                 "sbin")
-+# SBIN only used for mysqld
-+SET(INSTALL_SBINDIR_RPM                 "libexec")
- SET(INSTALL_SCRIPTDIR_RPM               "bin")
- #
- IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
--  SET(INSTALL_LIBDIR_RPM                "lib64")
-+  SET(INSTALL_LIBDIR_RPM                "lib64/mysql")
-   SET(INSTALL_PLUGINDIR_RPM             "lib64/mysql/plugin")
- ELSE()
--  SET(INSTALL_LIBDIR_RPM                "lib")
-+  SET(INSTALL_LIBDIR_RPM                "lib/mysql")
-   SET(INSTALL_PLUGINDIR_RPM             "lib/mysql/plugin")
- ENDIF()
- #
-@@ -148,7 +149,7 @@
- SET(INSTALL_SHAREDIR_RPM                "share")
- SET(INSTALL_MYSQLSHAREDIR_RPM           "share/mysql")
- SET(INSTALL_MYSQLTESTDIR_RPM            "share/mysql-test")
--SET(INSTALL_SQLBENCHDIR_RPM             "")
-+SET(INSTALL_SQLBENCHDIR_RPM             "share")
- SET(INSTALL_SUPPORTFILESDIR_RPM         "share/mysql")
- #
- SET(INSTALL_MYSQLDATADIR_RPM            "/var/lib/mysql")
diff --git a/mysql-5.5-no-docs.patch b/mysql-5.5-no-docs.patch
deleted file mode 100644
index e5d8074..0000000
--- a/mysql-5.5-no-docs.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Remove makefile logic dealing with mysql.info.  We cannot ship that
-documentation since it is not freely redistributable.
-
-
-diff -up mysql-5.5.6-rc/Docs/Makefile.am.orig mysql-5.5.6-rc/Docs/Makefile.am
---- mysql-5.5.6-rc/Docs/Makefile.am.orig	2010-09-17 22:48:14.000000000 +0200
-+++ mysql-5.5.6-rc/Docs/Makefile.am	2010-09-24 19:18:44.946002757 +0200
-@@ -20,20 +20,14 @@ EXTRA_DIST =		mysql.info INSTALL-BINARY 
- # 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
diff --git a/mysql-5.5-report.patch b/mysql-5.5-report.patch
deleted file mode 100644
index afebbab..0000000
--- a/mysql-5.5-report.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mysql-5.5.8/libmysqld/CMakeLists.txt.orig	2010-12-18 08:38:39.647131283 +0100
-+++ mysql-5.5.8/libmysqld/CMakeLists.txt	2010-12-18 08:38:42.916733537 +0100
-@@ -83,6 +83,7 @@
-            ../sql/scheduler.cc ../sql/sql_audit.cc
-            ../sql/sql_alter.cc ../sql/sql_partition_admin.cc
-            ../sql/event_parse_data.cc
-+           ../sql/rpl_reporting.cc
-            ../sql/sql_signal.cc ../sql/rpl_handler.cc
- 	       ../sql/rpl_utility.cc
-            ../sql/sys_vars.cc
diff --git a/mysql-5.5-tests.patch b/mysql-5.5-tests.patch
deleted file mode 100644
index 5faa26b..0000000
--- a/mysql-5.5-tests.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mysql-5.5.6-rc/mysql-test/r/mysqld--help-notwin.result.orig	2010-09-25 08:11:15.655515395 +0200
-+++ mysql-5.5.6-rc/mysql-test/r/mysqld--help-notwin.result	2010-09-25 08:11:58.507519135 +0200
-@@ -913,7 +913,7 @@
- slave-type-conversions 
- slow-launch-time 2
- slow-query-log FALSE
--socket /tmp/mysql.sock
-+socket /var/lib/mysql/mysql.sock
- sort-buffer-size 2097152
- sporadic-binlog-dump-fail FALSE
- sql-mode 
diff --git a/mysql-abi-check.patch b/mysql-abi-check.patch
deleted file mode 100644
index 5695ead..0000000
--- a/mysql-abi-check.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Fix "ABI check" that doesn't work on gcc >= 4.5, or indeed any compiler that
-aborts on missing #include's.  Per http://bugs.mysql.com/bug.php?id=52514
-
-
-diff -Naur mysql-5.1.48.orig/Makefile.am mysql-5.1.48/Makefile.am
---- mysql-5.1.48.orig/Makefile.am	2010-06-03 11:50:10.000000000 -0400
-+++ mysql-5.1.48/Makefile.am	2010-07-14 10:39:06.274186484 -0400
-@@ -275,10 +275,7 @@
- #
- # 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.
-+#    generation of preprocessor output for system headers.
- # 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
-@@ -314,14 +311,14 @@
- do_abi_check:
- 	set -ex; \
- 	for file in $(abi_headers); do \
--	         @CC@ -E -nostdinc -dI \
-+	         @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 | \
-+	                                 $$file | \
- 	                  @SED@ -e '/^# /d' \
- 	                            -e '/^[ 	]*$$/d' \
- 	                            -e '/^#pragma GCC set_debug_pwd/d' \
-diff -Naur mysql-5.1.48.orig/include/mysql.h mysql-5.1.48/include/mysql.h
---- mysql-5.1.48.orig/include/mysql.h	2010-06-03 11:50:21.000000000 -0400
-+++ mysql-5.1.48/include/mysql.h	2010-07-14 10:35:53.489148781 -0400
-@@ -44,7 +44,9 @@
- #endif
- 
- #ifndef _global_h				/* If not standard header */
-+#ifndef MYSQL_ABI_CHECK
- #include <sys/types.h>
-+#endif
- #ifdef __LCC__
- #include <winsock2.h>				/* For windows */
- #endif
-diff -Naur mysql-5.1.48.orig/include/mysql.h.pp mysql-5.1.48/include/mysql.h.pp
---- mysql-5.1.48.orig/include/mysql.h.pp	2010-06-03 11:50:12.000000000 -0400
-+++ mysql-5.1.48/include/mysql.h.pp	2010-07-14 10:35:53.491151797 -0400
-@@ -1,4 +1,3 @@
--#include <sys/types.h>
- typedef char my_bool;
- typedef int my_socket;
- #include "mysql_version.h"
diff --git a/mysql-lowercase-bug.patch b/mysql-lowercase-bug.patch
deleted file mode 100644
index 4387838..0000000
--- a/mysql-lowercase-bug.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Fix multiple coding errors related to upstream bug #52019.
-
-
-diff -Naur mysql-5.1.45.orig/client/mysqltest.cc mysql-5.1.45/client/mysqltest.cc
---- mysql-5.1.45.orig/client/mysqltest.cc	2010-03-01 14:30:46.000000000 -0500
-+++ mysql-5.1.45/client/mysqltest.cc	2010-03-25 19:46:36.000000000 -0400
-@@ -5586,7 +5586,7 @@
-       /* Could be a multibyte character */
-       /* This code is based on the code in "sql_load.cc" */
- #ifdef USE_MB
--      int charlen = my_mbcharlen(charset_info, c);
-+      int charlen = my_mbcharlen(charset_info, (unsigned char) c);
-       /* We give up if multibyte character is started but not */
-       /* completed before we pass buf_end */
-       if ((charlen > 1) && (p + charlen) <= buf_end)
-@@ -5598,16 +5598,16 @@
- 
- 	for (i= 1; i < charlen; i++)
- 	{
-+	  c= my_getc(cur_file->file);
- 	  if (feof(cur_file->file))
- 	    goto found_eof;
--	  c= my_getc(cur_file->file);
- 	  *p++ = c;
- 	}
- 	if (! my_ismbchar(charset_info, mb_start, p))
- 	{
- 	  /* It was not a multiline char, push back the characters */
- 	  /* We leave first 'c', i.e. pretend it was a normal char */
--	  while (p > mb_start)
-+	  while (p > mb_start+1)
- 	    my_ungetc(*--p);
- 	}
-       }
-@@ -9642,6 +9642,8 @@
- void replace_dynstr_append_mem(DYNAMIC_STRING *ds,
-                                const char *val, int len)
- {
-+  char lower[512];
-+
- #ifdef __WIN__
-   fix_win_paths(val, len);
- #endif
-@@ -9649,7 +9651,6 @@
-   if (display_result_lower) 
-   {
-     /* Convert to lower case, and do this first */
--    char lower[512];
-     char *c= lower;
-     for (const char *v= val;  *v;  v++)
-       *c++= my_tolower(charset_info, *v);
diff --git a/mysql-plugin-bug.patch b/mysql-plugin-bug.patch
deleted file mode 100644
index 2407f01..0000000
--- a/mysql-plugin-bug.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-The plugin_load test fails on PPC64 (maybe not always, but at least in the
-several tries I've made so far).  It doesn't fail on x86, x86_64, or ppc,
-at least not in a similarly small number of tries.  My best theory at the
-moment is that the test itself is wrong.  Reported upstream at
-http://bugs.mysql.com/bug.php?id=42144
-
-For the moment, just disable this test.
-
-Also, disable the outfile_loaddata test, which as of 5.1.38 is giving
-platform-dependent results, with the "expected" results being arguably the
-wrong ones.  This is upstream at http://bugs.mysql.com/bug.php?id=46895
-
-NB: 42144 is fixed as of 5.1.51, and 46895 has been "fixed" by disabling
-the test, so we won't need this anymore in 5.1.51.
-
-
-diff -Naur mysql-5.1.50.orig/mysql-test/t/disabled.def mysql-5.1.50/mysql-test/t/disabled.def
---- mysql-5.1.50.orig/mysql-test/t/disabled.def	2010-08-03 13:53:51.000000000 -0400
-+++ mysql-5.1.50/mysql-test/t/disabled.def	2010-08-27 23:36:17.491455874 -0400
-@@ -14,3 +14,5 @@
- partition_innodb_plugin  : Bug#53307 2010-04-30 VasilDimov valgrind warnings
- main.mysqlhotcopy_myisam : bug#54129 2010-06-04 Horst
- main.mysqlhotcopy_archive: bug#54129 2010-06-04 Horst
-+#
-+plugin_load         : gives wrong answer on PPC64
diff --git a/mysql.spec b/mysql.spec
index 3379b9c..5ba8567 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -42,7 +42,6 @@ Patch10: mysql-strmov.patch
 Patch12: mysql-cve-2008-7247.patch
 Patch13: mysql-expired-certs.patch
 Patch14: mysql-missing-string-code.patch
-# applied upstream - Patch15: mysql-lowercase-bug.patch
 Patch16: mysql-chain-certs.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -187,7 +186,6 @@ the MySQL sources.
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
-# %patch15 -p1
 %patch16 -p1
 
 # workaround for upstream bug #56342