packages: mysql/mysql-upgrade.patch, mysql/mysql.spec - checked some patches

[arekm]

Author: arekm                        Date: Wed Dec 15 21:08:21 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- checked some patches

---- Files affected:
packages/mysql:
   mysql-upgrade.patch (1.10 -> 1.11) , mysql.spec (1.499 -> 1.500) 

---- Diffs:

================================================================
Index: packages/mysql/mysql-upgrade.patch
diff -u packages/mysql/mysql-upgrade.patch:1.10 packages/mysql/mysql-upgrade.patch:1.11
--- packages/mysql/mysql-upgrade.patch:1.10	Wed Aug 26 11:42:51 2009
+++ packages/mysql/mysql-upgrade.patch	Wed Dec 15 22:08:15 2010
@@ -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");
+   }

================================================================
Index: packages/mysql/mysql.spec
diff -u packages/mysql/mysql.spec:1.499 packages/mysql/mysql.spec:1.500
--- packages/mysql/mysql.spec:1.499	Wed Dec 15 21:49:37 2010
+++ packages/mysql/mysql.spec	Wed Dec 15 22:08:15 2010
@@ -491,7 +491,7 @@
 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++
@@ -504,20 +504,19 @@
 # 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
@@ -1090,6 +1089,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.500  2010/12/15 21:08:15  arekm
+- checked some patches
+
 Revision 1.499  2010/12/15 20:49:37  arekm
 - build and install pass correctly. Patches still need review.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql-upgrade.patch?r1=1.10&r2=1.11&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mysql/mysql.spec?r1=1.499&r2=1.500&f=u