mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
Merge production.mysql.com:/usersnfs/jperkin/bk/build/5.0
into production.mysql.com:/usersnfs/jperkin/bk/bug-27692/5.0
This commit is contained in:
commit
61e8c53898
3 changed files with 12 additions and 0 deletions
|
@ -3059,6 +3059,7 @@ sub install_db ($$) {
|
|||
mtr_appendfile_to_file("$path_sql_dir/fill_help_tables.sql",
|
||||
$bootstrap_sql_file);
|
||||
|
||||
# Remove anonymous users
|
||||
mtr_tofile($bootstrap_sql_file,
|
||||
"DELETE FROM mysql.user where user= '';");
|
||||
|
||||
|
|
|
@ -371,7 +371,16 @@ then
|
|||
echo "To do so, start the server, then issue the following commands:"
|
||||
echo "$bindir/mysqladmin -u root password 'new-password'"
|
||||
echo "$bindir/mysqladmin -u root -h $hostname password 'new-password'"
|
||||
echo
|
||||
echo "Alternatively you can run:"
|
||||
echo "$bindir/mysql_secure_installation"
|
||||
echo
|
||||
echo "which will also give you the option of removing the test"
|
||||
echo "databases and anonymous user created by default. This is"
|
||||
echo "strongly recommended for production servers."
|
||||
echo
|
||||
echo "See the manual for more instructions."
|
||||
echo
|
||||
|
||||
if test "$in_rpm" -eq 0
|
||||
then
|
||||
|
|
|
@ -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','','','','',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','','','','',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','','','','',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;
|
||||
|
|
Loading…
Reference in a new issue