[Pkg-mysql-commits] r1300 - in branches/experimental-5.0/debian: . patches

[Norbert Tretkowski]

Author: nobse
Date: 2008-08-10 06:10:48 +0000 (Sun, 10 Aug 2008)
New Revision: 1300

Modified:
   branches/experimental-5.0/debian/changelog
   branches/experimental-5.0/debian/patches/25_mysys__default.c.dpatch
   branches/experimental-5.0/debian/patches/80_fix_user_setup_on_localhost.dpatch
Log:
Update patches.

Modified: branches/experimental-5.0/debian/changelog
===================================================================
--- branches/experimental-5.0/debian/changelog	2008-08-10 06:04:37 UTC (rev 1299)
+++ branches/experimental-5.0/debian/changelog	2008-08-10 06:10:48 UTC (rev 1300)
@@ -1,6 +1,9 @@
 mysql-dfsg-5.0 (5.0.67-1) experimental; urgency=low
 
   * New upstream release.
+  * Update patches:
+    + debian/patches/25_mysys__default.c.dpatch
+    + debian/patches/80_fix_user_setup_on_localhost.dpatch
   * Remove patches:
     + debian/patches/50_fix_mysqldump.dpatch
     + debian/patches/51_incorrect-order.dpatch

Modified: branches/experimental-5.0/debian/patches/25_mysys__default.c.dpatch
===================================================================
--- branches/experimental-5.0/debian/patches/25_mysys__default.c.dpatch	2008-08-10 06:04:37 UTC (rev 1299)
+++ branches/experimental-5.0/debian/patches/25_mysys__default.c.dpatch	2008-08-10 06:10:48 UTC (rev 1300)
@@ -5,15 +5,15 @@
 ## DP: mysys__default.c
 
 @DPATCH@
-
---- old/mysys/default.c	2005-05-26 15:26:56.000000000 +0200
-+++ new/mysys/default.c	2005-06-08 19:54:26.434959920 +0200
-@@ -866,7 +866,7 @@
+diff -Nur mysql-dfsg-5.0-5.0.67.orig/mysys/default.c mysql-dfsg-5.0-5.0.67/mysys/default.c
+--- mysql-dfsg-5.0-5.0.67.orig/mysys/default.c	2008-08-04 14:19:45.000000000 +0200
++++ mysql-dfsg-5.0-5.0.67/mysys/default.c	2008-08-10 08:05:56.000000000 +0200
+@@ -1077,7 +1077,7 @@
+ 
+ #else
+ 
+-  errors += add_directory(alloc, "/etc/", dirs);
++  errors += add_directory(alloc, "/etc/mysql/", dirs);
+ 
+ #if defined(__EMX__) || defined(OS2)
    if ((env= getenv("ETC")))
-     *ptr++= env;
- #endif
--  *ptr++= "/etc/";
-+  *ptr++= "/etc/mysql/";
- #endif
-   if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))
-     *ptr++= env;

Modified: branches/experimental-5.0/debian/patches/80_fix_user_setup_on_localhost.dpatch
===================================================================
--- branches/experimental-5.0/debian/patches/80_fix_user_setup_on_localhost.dpatch	2008-08-10 06:04:37 UTC (rev 1299)
+++ branches/experimental-5.0/debian/patches/80_fix_user_setup_on_localhost.dpatch	2008-08-10 06:10:48 UTC (rev 1300)
@@ -5,14 +5,14 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad mysql-dfsg-5.0-5.0.51a~/scripts/mysql_system_tables_data.sql mysql-dfsg-5.0-5.0.51a/scripts/mysql_system_tables_data.sql
---- mysql-dfsg-5.0-5.0.51a~/scripts/mysql_system_tables_data.sql	2008-01-11 15:43:26.000000000 +0100
-+++ mysql-dfsg-5.0-5.0.51a/scripts/mysql_system_tables_data.sql	2008-04-28 20:57:08.084428731 +0200
-@@ -18,6 +18,6 @@
- REPLACE INTO tmp_user VALUES (@@hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
+diff -Nur mysql-dfsg-5.0-5.0.67.orig/scripts/mysql_system_tables_data.sql mysql-dfsg-5.0-5.0.67/scripts/mysql_system_tables_data.sql
+--- mysql-dfsg-5.0-5.0.67.orig/scripts/mysql_system_tables_data.sql	2008-08-04 14:20:02.000000000 +0200
++++ mysql-dfsg-5.0-5.0.67/scripts/mysql_system_tables_data.sql	2008-08-10 08:09:46.000000000 +0200
+@@ -24,6 +24,6 @@
+ REPLACE INTO tmp_user VALUES (@current_hostname,'root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
  REPLACE INTO tmp_user VALUES ('127.0.0.1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0);
  INSERT INTO tmp_user (host,user) VALUES ('localhost','');
--INSERT INTO tmp_user (host,user) VALUES (@@hostname,'');
-+REPLACE INTO tmp_user (host,user) VALUES (@@hostname,'');
+-INSERT INTO tmp_user (host,user) VALUES (@current_hostname,'');
++REPLACE INTO tmp_user (host,user) VALUES (@current_hostname,'');
  INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;
  DROP TABLE tmp_user;