A fix (bug #6000: No "@%"-accounts after install).

edba2b9b · ram@gw.mysql.r18.ru · f003fb1f · edba2b9b
Commit edba2b9b authored Jan 28, 2005 by ram@gw.mysql.r18.ru
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 8 deletions

scripts/mysql_install_db.sh scripts/mysql_install_db.sh +10 -8

No files found.
--- 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