[Pkg-mysql-commits] r1255 - in trunk/debian: . patches

[Norbert Tretkowski]

Author: nobse
Date: 2008-06-21 11:52:43 +0000 (Sat, 21 Jun 2008)
New Revision: 1255

Added:
   trunk/debian/patches/80_fix_user_setup_on_localhost.dpatch
Modified:
   trunk/debian/changelog
   trunk/debian/patches/00list
Log:
New patch 80_fix_user_setup_on_localhost.dpatch from Daniel Hahler to fix a duplicate key error when install MySQL server on a host with hostname localhost

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-06-11 16:42:03 UTC (rev 1254)
+++ trunk/debian/changelog	2008-06-21 11:52:43 UTC (rev 1255)
@@ -1,3 +1,11 @@
+mysql-dfsg-5.0 (5.0.51a-8) UNRELEASED; urgency=low
+
+  * New patch 80_fix_user_setup_on_localhost.dpatch from Daniel Hahler to fix
+    a duplicate key error when install MySQL server on a host with hostname
+    localhost.
+
+ -- Norbert Tretkowski <nobse at debian.org>  Sat, 21 Jun 2008 13:50:45 +0200
+
 mysql-dfsg-5.0 (5.0.51a-7) unstable; urgency=high
 
   [ Norbert Tretkowski ]

Modified: trunk/debian/patches/00list
===================================================================
--- trunk/debian/patches/00list	2008-06-11 16:42:03 UTC (rev 1254)
+++ trunk/debian/patches/00list	2008-06-21 11:52:43 UTC (rev 1255)
@@ -14,7 +14,9 @@
 55_testsuite-2008.dpatch
 56_fix_order_by.dpatch
 57_fix_mysql_replication.dpatch
+80_fix_user_setup_on_localhost.dpatch
 86_PATH_MAX.dpatch
 89_ndb__staticlib.dpatch
 90_upstreamdebiandir.dpatch
 91_SECURITY_CVE-2007-5925.dpatch
+92_SECURITY_CVE-2008-2079.dpatch

Added: trunk/debian/patches/80_fix_user_setup_on_localhost.dpatch
===================================================================
--- trunk/debian/patches/80_fix_user_setup_on_localhost.dpatch	                        (rev 0)
+++ trunk/debian/patches/80_fix_user_setup_on_localhost.dpatch	2008-06-21 11:52:43 UTC (rev 1255)
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 80_fix_user_setup_on_localhost.dpatch by Daniel Hahler <ubuntu at thequod.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at 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);
+ 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 user SELECT * FROM tmp_user WHERE @had_user_table=0;
+ DROP TABLE tmp_user;