- up to 5.5.33; link patch looks unneded (builds fine without and with systemtap...

[packages/mysql.git] / mysql-system-users.patch

diff --git a/mysql-system-users.patch b/mysql-system-users.patch
index b4f38e3a6a6007150af3999466b806b04c490e4f..34b360ce2530634f887d3ef89f708f80b464b418 100644 (file)
--- a/mysql-system-users.patch
+++ b/mysql-system-users.patch
@@ -1,9 +1,10 @@
 --- mysql-5.5.8/scripts/mysql_system_tables_data.sql.org       2010-12-16 00:09:23.662631925 +0100
 +++ mysql-5.5.8/scripts/mysql_system_tables_data.sql   2010-12-16 00:10:17.763454969 +0100
-@@ -8,23 +8,18 @@
- set @current_hostname= @@hostname;
- 
+@@ -27,23 +27,17 @@
+ SET @get_hostname= @@hostname;
+ SELECT REPLACE((SELECT REPLACE(@get_hostname,'_','\_')),'%','\%') INTO @current_hostname;
  
+-
 --- 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;
@@ -13,10 +14,9 @@
 -DROP TABLE tmp_db;
 -
 -
- -- Fill "users" table with default users allowing root access
- -- from local machine if "users" table didn't exist before
+ -- Fill "user" table with default users allowing root access
+ -- from local machine if "user" table didn't exist before
  CREATE TEMPORARY TABLE tmp_user LIKE user;
- set @current_hostname= @@hostname;
 -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','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','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','Y','','','','',0,0,0,0,'','');