[Pkg-mysql-commits] r1369 - trunk/debian/patches

[Norbert Tretkowski]

Author: nobse
Date: 2008-12-11 13:16:42 +0000 (Thu, 11 Dec 2008)
New Revision: 1369

Modified:
   trunk/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch
Log:
Patch broken, update.

Modified: trunk/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch
===================================================================
--- trunk/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch	2008-12-11 13:10:59 UTC (rev 1368)
+++ trunk/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch	2008-12-11 13:16:42 UTC (rev 1369)
@@ -5,13 +5,14 @@
 ## DP: Don't create guest account
 
 @DPATCH@
---- mysql-dfsg-5.0-5.0.51a/scripts/mysql_system_tables_data.sql	2008-12-11 14:03:40.000000000 +0100
-+++ mysql-dfsg-5.0-5.0.51a.orig/scripts/mysql_system_tables_data.sql	2008-01-11 15:43:26.000000000 +0100
-@@ -17,5 +17,7 @@
+diff -Nur mysql-dfsg-5.0-5.0.51a.orig/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.orig/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-12-11 14:15:11.000000000 +0100
+@@ -17,7 +17,5 @@
  INSERT INTO tmp_user VALUES ('localhost','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 (@@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,'');
+-INSERT INTO tmp_user (host,user) VALUES ('localhost','');
+-INSERT INTO tmp_user (host,user) VALUES (@@hostname,'');
  INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;
  DROP TABLE tmp_user;