summaryrefslogtreecommitdiff
path: root/scripts/mysql_install_db.sh
diff options
context:
space:
mode:
authorram@gw.mysql.r18.ru <>2005-02-01 17:13:44 +0400
committerram@gw.mysql.r18.ru <>2005-02-01 17:13:44 +0400
commit40daecb8b41bb95232e0f0f7368fe9899594cdd9 (patch)
tree631d42d2862d0202bb9b49363ea03a076588f0e1 /scripts/mysql_install_db.sh
parentc02d97b5e2298931cbe3495ede2458d29c5f19d8 (diff)
parent2d01238eb191802508f569859b939bcf14028991 (diff)
downloadmariadb-git-40daecb8b41bb95232e0f0f7368fe9899594cdd9.tar.gz
after merge fix up:
we should use REPLACE for $hostaname queries to avoid problems when $hostname=localhost.
Diffstat (limited to 'scripts/mysql_install_db.sh')
-rw-r--r--scripts/mysql_install_db.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index e35fcb80282..0b3742638f5 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -281,10 +281,10 @@ then
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);
+ 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','');"
- fi
+ REPLACE INTO user (host,user) values ('$hostname','');"
+ fi
fi
if test ! -f $mdata/func.frm