summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorunknown <msvensson@pilot.mysql.com>2007-10-03 13:44:37 +0200
committerunknown <msvensson@pilot.mysql.com>2007-10-03 13:44:37 +0200
commit3b148edb34fd5ec982089bd3cf26c362742955ba (patch)
tree8afca8c1614af5be1cc62ee56e2ec9478de43593 /scripts
parent7f5bf01c123347753099aa0a11abdaf1caad7d3d (diff)
parent126f7c3d27df310ecb32b037f3ea5dd4eea640fe (diff)
downloadmariadb-git-3b148edb34fd5ec982089bd3cf26c362742955ba.tar.gz
Merge bk-internal:/home/bk/mysql-5.1-maint
into pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-new-maint
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysql_system_tables_data.sql3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/mysql_system_tables_data.sql b/scripts/mysql_system_tables_data.sql
index 07aa932cda2..13cff13f48d 100644
--- a/scripts/mysql_system_tables_data.sql
+++ b/scripts/mysql_system_tables_data.sql
@@ -14,8 +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
CREATE TEMPORARY TABLE tmp_user LIKE user;
+set @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','','','','',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','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','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','Y','Y','','','','',0,0,0,0);
INSERT INTO user SELECT * FROM tmp_user WHERE @had_user_table=0;
DROP TABLE tmp_user;