diff options
| author | unknown <msvensson@pilot.mysql.com> | 2007-10-03 11:19:24 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.mysql.com> | 2007-10-03 11:19:24 +0200 |
| commit | ad295bcb034b192e59edd23ad25c0f4ad6519ceb (patch) | |
| tree | c43c18122dae9c182ab8ec1bd28c8997244dd2d9 /scripts | |
| parent | b6f28be2bef325be366ec5727907d7ddec8039af (diff) | |
| parent | e548c983dc73c8a3372eb2b83ed586c4fedfb5f6 (diff) | |
| download | mariadb-git-ad295bcb034b192e59edd23ad25c0f4ad6519ceb.tar.gz | |
Merge pilot.mysql.com:/data/msvensson/mysql/bug31167/my50-bug31167
into pilot.mysql.com:/data/msvensson/mysql/bug31167/my51-bug31167
scripts/mysql_system_tables_data.sql:
Merge 5.0->5.1
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_system_tables_data.sql | 3 |
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; |