[Pkg-mysql-commits] r1373 - branches/experimental-5.0/debian/patches

[Norbert Tretkowski]

Author: nobse
Date: 2008-12-11 14:35:31 +0000 (Thu, 11 Dec 2008)
New Revision: 1373

Removed:
   branches/experimental-5.0/debian/patches/80_fix_user_setup_on_localhost.dpatch
Modified:
   branches/experimental-5.0/debian/patches/00list
Log:
Drop patch, no longer required.

Modified: branches/experimental-5.0/debian/patches/00list
===================================================================
--- branches/experimental-5.0/debian/patches/00list	2008-12-11 14:26:44 UTC (rev 1372)
+++ branches/experimental-5.0/debian/patches/00list	2008-12-11 14:35:31 UTC (rev 1373)
@@ -8,6 +8,5 @@
 44_scripts__mysql_config__libs.dpatch
 45_warn-CLI-passwords.dpatch
 60_disabled_tests.dpatch
-80_fix_user_setup_on_localhost.dpatch
 86_PATH_MAX.dpatch
 89_ndb__staticlib.dpatch

Deleted: 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-12-11 14:26:44 UTC (rev 1372)
+++ branches/experimental-5.0/debian/patches/80_fix_user_setup_on_localhost.dpatch	2008-12-11 14:35:31 UTC (rev 1373)
@@ -1,18 +0,0 @@
-#! /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 -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 (@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;