- update to 5.1.14

Changed files:
    mysql-upgrade.patch -> 1.2

diff --git a/mysql-upgrade.patch b/mysql-upgrade.patch
index 404dd19e777fec7bc0e750a93c35e571743b1ad0..991e7bf03c229b2b4cbcc99163d14d9b61fd2476 100644 (file)
--- a/mysql-upgrade.patch
+++ b/mysql-upgrade.patch
@@ -1,11 +1,11 @@
---- mysql-5.1.11-beta/client/mysql_upgrade.c~  2006-06-02 21:01:24.000000000 +0300
-+++ mysql-5.1.11-beta/client/mysql_upgrade.c   2006-11-01 20:39:36.489202516 +0200
-@@ -18,7 +18,7 @@
- #include <my_dir.h>
+--- mysql-5.1.14-beta/client/mysql_upgrade.c~  2006-12-13 12:09:28.860238973 +0200
++++ mysql-5.1.14-beta/client/mysql_upgrade.c   2006-12-13 12:10:17.331321518 +0200
+@@ -40,7 +40,7 @@
+ extern TYPELIB sql_protocol_typelib;
  
- static my_bool opt_force= 0, opt_verbose= 0, tty_password= 0;
+ static my_bool opt_force= 0, opt_verbose= 0, opt_compress= 0;
 -static char *user= (char*) "root", *basedir= 0, *datadir= 0, *opt_password= 0;
-+static char *user= (char*) "mysql", *basedir= (char *)"/usr", *datadir= 0, *opt_password= 0;
- static my_bool upgrade_defaults_created= 0;
- static my_string opt_mysql_port, opt_mysql_unix_port= 0;
- static char *default_dbug_option= (char*) "d:t:O,/tmp/comp_err.trace";
++static char *user= (char*) "mysql", *basedir= 0, *datadir= 0, *opt_password= 0;
+ static char *current_host= 0;
+ static char *opt_default_charset= 0, *opt_charsets_dir= 0;
+ #ifdef HAVE_SMEM