Commit 583a3ef3 authored by jperkin@production.mysql.com's avatar jperkin@production.mysql.com
Browse files

Merge production.mysql.com:/usersnfs/jperkin/bk/build/5.0 

into  production.mysql.com:/usersnfs/jperkin/bk/bug-27692/5.0
parents a4450a71 5c0c5921

mysql-test/mysql-test-run.pl

+1 −0
Original line number Diff line number Diff line
@@ -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= '';");

scripts/mysql_install_db.sh

+9 −0
Original line number Diff line number Diff line
@@ -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

scripts/mysql_system_tables_data.sql

+2 −0
Original line number Diff line number Diff line
@@ -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;