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

[Norbert Tretkowski]

Author: nobse
Date: 2008-12-22 08:49:46 +0000 (Mon, 22 Dec 2008)
New Revision: 1381

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

Modified: branches/experimental-5.0/debian/changelog
===================================================================
--- branches/experimental-5.0/debian/changelog	2008-12-22 08:45:22 UTC (rev 1380)
+++ branches/experimental-5.0/debian/changelog	2008-12-22 08:49:46 UTC (rev 1381)
@@ -1,6 +1,8 @@
 mysql-dfsg-5.0 (5.0.75-1) unstable; urgency=low
 
   * New upstream release.
+  * Update patches:
+    + debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch
   * Remove patches:
     + debian/patches/50_fix_agg_functions.dpatch
 

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-22 08:45:22 UTC (rev 1380)
+++ branches/experimental-5.0/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch	2008-12-22 08:49:46 UTC (rev 1381)
@@ -5,14 +5,14 @@
 ## DP: Don't create guest account
 
 @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-12-11 15:26:19.000000000 +0100
+diff -Nur mysql-dfsg-5.0-5.0.75.orig/scripts/mysql_system_tables_data.sql mysql-dfsg-5.0-5.0.75/scripts/mysql_system_tables_data.sql
+--- mysql-dfsg-5.0-5.0.75.orig/scripts/mysql_system_tables_data.sql     2008-12-18 18:20:09.000000000 +0100
++++ mysql-dfsg-5.0-5.0.75/scripts/mysql_system_tables_data.sql  2008-12-22 09:48:57.000000000 +0100
 @@ -23,7 +23,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 (@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 SELECT @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 FROM dual WHERE LOWER( @current_hostname) != 'localhost';
  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,'');
+-INSERT INTO tmp_user (host,user) SELECT @current_hostname,'' FROM dual WHERE LOWER(@current_hostname ) != 'localhost';
  INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;
  DROP TABLE tmp_user;