[Pkg-mysql-commits] r1356 - in branches/sid-5.1/debian: . patches

[Norbert Tretkowski]

tags 463704 pending
thanks

Author: nobse
Date: 2008-12-04 22:08:39 +0000 (Thu, 04 Dec 2008)
New Revision: 1356

Modified:
   branches/sid-5.1/debian/changelog
   branches/sid-5.1/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch
Log:
Don't create a guest account during bootstrap.

Modified: branches/sid-5.1/debian/changelog
===================================================================
--- branches/sid-5.1/debian/changelog	2008-12-04 22:07:58 UTC (rev 1355)
+++ branches/sid-5.1/debian/changelog	2008-12-04 22:08:39 UTC (rev 1356)
@@ -238,8 +238,9 @@
 
   * New patch 50_fix_mysqldump2.dpatch from 5.0.60 to fix dumping databases
     from mysql 4.0 server. (closes: #507789)
+  * Don't create a guest account during bootstrap. (closes: #463704)
 
- -- Norbert Tretkowski <nobse at debian.org>  Thu, 04 Dec 2008 21:17:25 +0100
+ -- Norbert Tretkowski <nobse at debian.org>  Thu, 04 Dec 2008 23:07:19 +0100
 
 mysql-dfsg-5.0 (5.0.51a-18) testing-proposed-updates; urgency=high
 

Modified: branches/sid-5.1/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch
===================================================================
--- branches/sid-5.1/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch	2008-12-04 22:07:58 UTC (rev 1355)
+++ branches/sid-5.1/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch	2008-12-04 22:08:39 UTC (rev 1356)
@@ -8,10 +8,9 @@
 ## DP: http://bugs.mysql.com/bug.php?id=6901
 
 @DPATCH@
-
---- old/scripts/mysql_system_tables_data.sql	2007-06-11 23:24:10.000000000 +0200
-+++ new/scripts/mysql_system_tables_data.sql	2007-06-11 23:25:07.000000000 +0200
-@@ -5,8 +5,6 @@
+--- old/scripts/mysql_system_tables_data.sql	2008-12-04 22:59:44.000000000 +0100
++++ new/scripts/mysql_system_tables_data.sql	2008-12-04 23:00:07.000000000 +0100
+@@ -11,8 +11,6 @@
  -- Fill "db" table with default grants for anyone to
  -- access database 'test' and 'test_%' if "db" table didn't exist
  CREATE TEMPORARY TABLE tmp_db LIKE db;
@@ -20,3 +19,11 @@
  INSERT INTO db SELECT * FROM tmp_db WHERE @had_db_table=0;
  DROP TABLE tmp_db;
  
+@@ -24,7 +22,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','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','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','Y','Y','','','','',0,0,0,0);
+-INSERT INTO tmp_user (host,user) VALUES ('localhost','');
+-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;