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

[Norbert Tretkowski]

tags 463704 pending
thanks

Author: nobse
Date: 2008-12-04 22:20:46 +0000 (Thu, 04 Dec 2008)
New Revision: 1357

Added:
   branches/experimental-5.0/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch
Modified:
   branches/experimental-5.0/debian/changelog
   branches/experimental-5.0/debian/patches/00list
Log:
Merge

Modified: branches/experimental-5.0/debian/changelog
===================================================================
--- branches/experimental-5.0/debian/changelog	2008-12-04 22:08:39 UTC (rev 1356)
+++ branches/experimental-5.0/debian/changelog	2008-12-04 22:20:46 UTC (rev 1357)
@@ -40,9 +40,9 @@
 
   * New patch 50_fix_mysqldump2.dpatch from 5.0.60 to fix dumping databases
     from mysql 4.0 server. (closes: #507789)
-  * Really fix FTBFS if build twice in a row. (closes: #442684)
+  * 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/experimental-5.0/debian/patches/00list
===================================================================
--- branches/experimental-5.0/debian/patches/00list	2008-12-04 22:08:39 UTC (rev 1356)
+++ branches/experimental-5.0/debian/patches/00list	2008-12-04 22:20:46 UTC (rev 1357)
@@ -1,6 +1,7 @@
 01_MAKEFILES__Docs_Images_Makefile.in.dpatch
 01_MAKEFILES__Docs_Makefile.in.dpatch
 25_mysys__default.c.dpatch
+33_scripts__mysql_create_system_tables__no_test.dpatch
 37_scripts__mysqld_safe.sh__syslog.dpatch
 38_scripts__mysqld_safe.sh__signals.dpatch
 41_scripts__mysql_install_db.sh__no_test.dpatch

Added: 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	                        (rev 0)
+++ branches/experimental-5.0/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch	2008-12-04 22:20:46 UTC (rev 1357)
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 33_scripts__mysql_create_system_tables__no_test.dpatch by <nobse at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Don't create guest account
+
+ at DPATCH@
+--- 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-04 23:03:19.000000000 +0100
+@@ -5,8 +5,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;
+-INSERT INTO tmp_db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N');
+-INSERT INTO tmp_db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N');
+ INSERT INTO db SELECT * FROM tmp_db WHERE @had_db_table=0;
+ DROP TABLE tmp_db;
+ 
+@@ -17,7 +15,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 user SELECT * FROM tmp_user WHERE @had_user_table=0;
+ DROP TABLE tmp_user;