diff options
| author | unknown <jperkin@production.mysql.com> | 2007-10-04 12:21:51 +0200 |
|---|---|---|
| committer | unknown <jperkin@production.mysql.com> | 2007-10-04 12:21:51 +0200 |
| commit | a006263f8b8dc04a55c82c4ab75c473d2d0a49b9 (patch) | |
| tree | 14ec3c6bac81a7a2b08c0e90183e843d94b35622 /scripts/mysql_system_tables_data.sql | |
| parent | 88f1ad8cd61f91038121e487c263c77f69a8f37e (diff) | |
| parent | 61e8c53898fedd38db9abbc8596013d70882f136 (diff) | |
| download | mariadb-git-a006263f8b8dc04a55c82c4ab75c473d2d0a49b9.tar.gz | |
Merge production.mysql.com:/usersnfs/jperkin/bk/build/5.0
into production.mysql.com:/usersnfs/jperkin/bk/build/5.1
mysql-test/mysql-test-run.pl:
Auto merged
scripts/mysql_install_db.sh:
Auto merged
Diffstat (limited to 'scripts/mysql_system_tables_data.sql')
| -rw-r--r-- | scripts/mysql_system_tables_data.sql | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/mysql_system_tables_data.sql b/scripts/mysql_system_tables_data.sql index 07aa932cda2..6af79f3b049 100644 --- a/scripts/mysql_system_tables_data.sql +++ b/scripts/mysql_system_tables_data.sql @@ -17,5 +17,7 @@ CREATE TEMPORARY TABLE tmp_user LIKE user; 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 ('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 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; |