From bbae9ea77135f3e5cfec30e94ac861ed527f67d1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Wed, 15 Dec 2010 21:08:15 +0000
Subject: [PATCH] - checked some patches

Changed files:
    mysql-upgrade.patch -> 1.11
    mysql.spec -> 1.500
---
 mysql-upgrade.patch | 29 +++++++++++++++++------------
 mysql.spec          | 13 ++++++-------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/mysql-upgrade.patch b/mysql-upgrade.patch
index b1d0935..49f5369 100644
--- a/mysql-upgrade.patch
+++ b/mysql-upgrade.patch
@@ -1,6 +1,6 @@
---- mysql-5.1.28-rc/client/mysql_upgrade.c~	2008-09-14 23:53:11.000000000 +0300
-+++ mysql-5.1.28-rc/client/mysql_upgrade.c	2008-09-15 00:02:34.047520349 +0300
-@@ -31,12 +31,12 @@
+--- mysql-5.5.8/client/mysql_upgrade.c~	2010-12-03 18:58:26.000000000 +0100
++++ mysql-5.5.8/client/mysql_upgrade.c	2010-12-15 23:06:17.178431694 +0100
+@@ -33,13 +33,13 @@
  # endif
  #endif
  
@@ -9,23 +9,28 @@
 +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;
+ static my_bool opt_force, opt_verbose, debug_info_flag, debug_check_flag,
+                opt_systables_only;
  static uint my_end_arg= 0;
 -static char *opt_user= (char*)"root";
 +static char *opt_user= (char*)"mysql";
  
  static DYNAMIC_STRING ds_args;
- 
-@@ -761,12 +761,6 @@
+ static DYNAMIC_STRING conn_args;
+@@ -848,15 +848,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);
 -
--  /* Find mysqlcheck */
--  find_tool(mysqlcheck_path, IF_WIN("mysqlcheck.exe", "mysqlcheck"), self_name);
--
-   /*
-     Read the mysql_upgrade_info file to check if mysql_upgrade
-     already has been run for this installation of MySQL
+-  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");
+   }
diff --git a/mysql.spec b/mysql.spec
index 34a62cc..008a2ea 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -490,7 +490,7 @@ Ten pakiet zawiera standardowego demona MySQL NDB CPC.
 mv sphinx-*/mysqlse storage/sphinx
 %patch18 -p1
 %endif
-# CHECK ME
+# CHECK ME, seems obsolete
 #%patch0 -p1
 #%{?with_tcpd:%patch1 -p1}  # WHATS PURPOSE OF THIS PATCH?
 #%patch2 -p1 # NEEDS CHECK, which exact program needs -lc++
@@ -503,20 +503,19 @@ mv sphinx-*/mysqlse storage/sphinx
 # gcc 3.3.x ICE
 %patch10 -p1
 %endif
-# CHECK ME
+# CHECK ME, obsolete
 #%patch5 -p1
-# CHECK ME
+# CHECK ME, NEEDS FIX!
 #%patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-# CHECK ME
-#%patch11 -p1
+%patch11 -p1
 %patch12 -p1
 %patch14 -p0
-# CHECK ME
+# CHECK ME, obsolete
 #%patch15 -p1
-# OBSOLETE?
+# OBSOLETE, YES
 #%patch16 -p1
 # <percona %patches>
 # CHECK ME
-- 
2.44.0