bzr push into mysql-trunk branch (Georgi.Kodinov:3111 to 3112)

[Georgi Kodinov]

 3112 Georgi Kodinov	2010-07-14 [merge]
      merge

    modified:
      scripts/mysql_secure_installation.pl.in
      scripts/mysql_secure_installation.sh
 3111 Georgi Kodinov	2010-07-14 [merge]
      merge

    modified:
      client/mysqlshow.c
      regex/regcomp.c
      scripts/mysql_secure_installation.sh
=== modified file 'scripts/mysql_secure_installation.pl.in'
--- a/scripts/mysql_secure_installation.pl.in	2009-11-03 21:34:01 +0000
+++ b/scripts/mysql_secure_installation.pl.in	2010-07-14 10:53:49 +0000
@@ -208,7 +208,7 @@ sub remove_anonymous_users {
 }
 
 sub remove_remote_root {
-  if (do_query("DELETE FROM mysql.user WHERE User='root' AND Host!='localhost';")) {
+  if (do_query("DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1');")) {
     print " ... Success!\n";
   } else {
     print " ... Failed!\n";

=== modified file 'scripts/mysql_secure_installation.sh'
--- a/scripts/mysql_secure_installation.sh	2010-07-09 11:11:12 +0000
+++ b/scripts/mysql_secure_installation.sh	2010-07-14 10:53:49 +0000
@@ -164,7 +164,7 @@ remove_anonymous_users() {
 }
 
 remove_remote_root() {
-    do_query "DELETE FROM mysql.user WHERE User='root' AND Host!='localhost';"
+    do_query "DELETE FROM mysql.user WHERE User='root' AND Host NOT IN ('localhost', '127.0.0.1', '::1');"
     if [ $? -eq 0 ]; then
 	echo " ... Success!"
     else


Attachment: [text/bzr-bundle] bzr/[e-mail]