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

[Norbert Tretkowski]

Author: nobse
Date: 2008-12-11 14:22:49 +0000 (Thu, 11 Dec 2008)
New Revision: 1371

Modified:
   branches/experimental-5.0/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch
Log:
Update patch

Modified: branches/experimental-5.0/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch
===================================================================
--- branches/experimental-5.0/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch	2008-12-11 13:33:00 UTC (rev 1370)
+++ branches/experimental-5.0/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch	2008-12-11 14:22:49 UTC (rev 1371)
@@ -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.67/scripts/mysql_system_tables_data.sql 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	2008-12-11 15:14:53.000000000 +0100
++++ mysql-dfsg-5.0-5.0.67.orig/scripts/mysql_system_tables_data.sql	2008-08-04 14:20:02.000000000 +0200
+@@ -23,5 +23,7 @@
  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 (@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,'');
++INSERT INTO tmp_user (host,user) VALUES (@current_hostname,'');
  INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;
  DROP TABLE tmp_user;