- remove unused patches

diff --git a/mysql-config.patch b/mysql-config.patch
deleted file mode 100644 (file)
index ac61f8f..0000000
--- a/mysql-config.patch
+++ /dev/null
@@ -1,32 +0,0 @@
---- Percona-Server-5.6.13-rel61.0/scripts/mysql_config.sh~     2013-10-07 12:25:25.000000000 +0200
-+++ Percona-Server-5.6.13-rel61.0/scripts/mysql_config.sh      2013-10-15 18:17:41.547988430 +0200
-@@ -124,23 +124,23 @@
- for remove in DDBUG_OFF DSAFE_MUTEX DFORCE_INIT_OF_VARS \
-               DEXTRA_DEBUG DHAVE_purify O 'O[0-9]' 'xO[0-9]' 'W[-A-Za-z]*' \
-               'mtune=[-A-Za-z0-9]*' 'mcpu=[-A-Za-z0-9]*' 'march=[-A-Za-z0-9]*' \
--              unroll2 ip mp restrict
-+              unroll2 ip mp restrict 'f[-a-z0-9]*' 'g[-a-z0-9]*' 'm[-a-z0-9]*'
- do
-   # The first option we might strip will always have a space before it because
-   # we set -I$pkgincludedir as the first option
--  cflags=`echo "$cflags"|sed -e "s/ -$remove  */ /g"` 
-+  cflags=`echo "$cflags"|sed -e "s/ \(-$remove  *\)\{1,\}/ /g"`
-   cxxflags=`echo "$cxxflags"|sed -e "s/ -$remove  */ /g"` 
- done
- cflags=`echo "$cflags"|sed -e 's/ *\$//'` 
- cxxflags=`echo "$cxxflags"|sed -e 's/ *\$//'` 
- 
- # Same for --libs(_r)
--for remove in lmtmalloc static-libcxa i-static static-intel
-+for remove in lmtmalloc static-libcxa i-static static-intel 'Wl,-[-a-z0-9,]*'
- do
-   # We know the strings starts with a space
--  libs=`echo "$libs"|sed -e "s/ -$remove  */ /g"` 
--  libs_r=`echo "$libs_r"|sed -e "s/ -$remove  */ /g"` 
--  embedded_libs=`echo "$embedded_libs"|sed -e "s/ -$remove  */ /g"` 
-+  libs=`echo "$libs"|sed -e "s/ \(-$remove  *\)\{1,\}/ /g"`
-+  libs_r=`echo "$libs_r"|sed -e "s/ \(-$remove  *\)\{1,\}/ /g"`
-+  embedded_libs=`echo "$embedded_libs"|sed -e "s/ \(-$remove  *\)\{1,\}/ /g"`
- done
- 
- # Strip trailing and ending space if any, and '+' (FIXME why?)

diff --git a/mysql-upgrade.patch b/mysql-upgrade.patch
deleted file mode 100644 (file)
index 397747c..0000000
--- a/mysql-upgrade.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- mysql-5.5.32/client/mysql_upgrade.c.orig   2013-07-01 03:16:34.000000000 +0000
-+++ mysql-5.5.32/client/mysql_upgrade.c        2013-07-09 16:15:08.366178596 +0000
-@@ -35,13 +35,13 @@
- # endif
- #endif
- 
--static char mysql_path[FN_REFLEN];
--static char mysqlcheck_path[FN_REFLEN];
-+static char *mysql_path = "/usr/bin/mysql";
-+static char *mysqlcheck_path = "/usr/sbin/mysqlcheck";
- 
- static my_bool opt_force, opt_verbose, debug_info_flag, debug_check_flag,
-                opt_systables_only, opt_version_check;
- static uint my_end_arg= 0;
--static char *opt_user= (char*)"root";
-+static char *opt_user= (char*)"mysql";
- 
- static DYNAMIC_STRING ds_args;
- static DYNAMIC_STRING conn_args;
-@@ -923,15 +923,7 @@
-   dynstr_append_os_quoted(&ds_args, "--user=", opt_user, NullS);
-   dynstr_append(&ds_args, " ");
- 
--  /* Find mysql */
--  find_tool(mysql_path, IF_WIN("mysql.exe", "mysql"), self_name);
--
--  if (!opt_systables_only)
--  {
--    /* Find mysqlcheck */
--    find_tool(mysqlcheck_path, IF_WIN("mysqlcheck.exe", "mysqlcheck"), self_name);
--  }
--  else
-+  if (opt_systables_only)
-   {
-     printf("The --upgrade-system-tables option was used, databases won't be touched.\n");
-   }