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

[Norbert Tretkowski]

Author: nobse
Date: 2008-12-11 13:33:00 +0000 (Thu, 11 Dec 2008)
New Revision: 1370

Modified:
   branches/experimental-5.0/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch
Log:
Merge from testing.

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:16:42 UTC (rev 1369)
+++ branches/experimental-5.0/debian/patches/33_scripts__mysql_create_system_tables__no_test.dpatch	2008-12-11 13:33:00 UTC (rev 1370)
@@ -5,22 +5,13 @@
 ## DP: Don't create guest account
 
 @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 @@
+--- 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 @@
  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;