diff options
| author | ram@gw.mysql.r18.ru <> | 2005-01-28 15:26:17 +0400 |
|---|---|---|
| committer | ram@gw.mysql.r18.ru <> | 2005-01-28 15:26:17 +0400 |
| commit | edba2b9b335a4e3ca0feb7e9dcd6776ad349df39 (patch) | |
| tree | 9c735a29654ba22c701b091825a9298c2e94f00b /scripts | |
| parent | f003fb1f9c8042f061c10e3df9ce0627098218b6 (diff) | |
| download | mariadb-git-edba2b9b335a4e3ca0feb7e9dcd6776ad349df39.tar.gz | |
A fix (bug #6000: No "@%"-accounts after install).
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysql_install_db.sh | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh index 8d47d67792a..40827f8b6ef 100644 --- a/scripts/mysql_install_db.sh +++ b/scripts/mysql_install_db.sh @@ -275,14 +275,16 @@ then c_u="$c_u )" c_u="$c_u comment='Users and global privileges';" - i_u="INSERT INTO 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','','','','',0,0,0); - INSERT INTO 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','','','','',0,0,0); - - REPLACE INTO 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','','','','',0,0,0); - REPLACE INTO 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','','','','',0,0,0); - - INSERT INTO user (host,user) values ('localhost',''); - INSERT INTO user (host,user) values ('$hostname','');" + if test "$windows" = 1 + then + i_u="INSERT INTO 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','','','','',0,0,0); + INSERT INTO user (host,user) values ('localhost','');" + else + i_u="INSERT INTO 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','','','','',0,0,0); + INSERT INTO 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','','','','',0,0,0); + INSERT INTO user (host,user) values ('localhost',''); + INSERT INTO user (host,user) values ('$hostname','');" + fi fi if test ! -f $mdata/func.frm |