From: Alexander Nozdrin
Date: April 27 2012 3:24pm
Subject: bzr push into mysql-trunk branch (alexander.nozdrin:3757 to 3758)
List-Archive: http://lists.mysql.com/commits/143686
Message-Id: <201204271524.q3RFOcbo011514@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3758 Alexander Nozdrin	2012-04-27 [merge]
      Manual merge from 5.5.

    modified:
      mysql-test/r/mysqld--help-notwin.result
      mysql-test/r/mysqld--help-win.result
      sql/mysqld.cc
      sql/sys_vars.cc
 3757 Alexander Nozdrin	2012-04-27 [merge]
      Auto-merge from 5.5.

    modified:
      sql/mysqld.cc
=== modified file 'mysql-test/r/mysqld--help-notwin.result'
--- a/mysql-test/r/mysqld--help-notwin.result	2012-03-21 21:19:11 +0000
+++ b/mysql-test/r/mysqld--help-notwin.result	2012-04-27 15:23:58 +0000
@@ -904,7 +904,7 @@ autocommit TRUE
 automatic-sp-privileges TRUE
 back-log 50
 big-tables FALSE
-bind-address (No default value)
+bind-address 0.0.0.0
 binlog-cache-size 32768
 binlog-checksum NONE
 binlog-direct-non-transactional-updates FALSE

=== modified file 'mysql-test/r/mysqld--help-win.result'
--- a/mysql-test/r/mysqld--help-win.result	2012-03-21 21:19:11 +0000
+++ b/mysql-test/r/mysqld--help-win.result	2012-04-27 15:23:58 +0000
@@ -912,7 +912,7 @@ autocommit TRUE
 automatic-sp-privileges TRUE
 back-log 50
 big-tables FALSE
-bind-address (No default value)
+bind-address 0.0.0.0
 binlog-cache-size 32768
 binlog-checksum NONE
 binlog-direct-non-transactional-updates FALSE

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2012-04-27 14:45:47 +0000
+++ b/sql/mysqld.cc	2012-04-27 15:23:58 +0000
@@ -2073,9 +2073,6 @@ static void network_init(void)
     struct addrinfo *ai, *a;
     struct addrinfo hints;
 
-    if (!my_bind_addr_str)
-      my_bind_addr_str= (char *) "0.0.0.0";
-
     sql_print_information("Server hostname (bind-address): '%s'; port: %d",
                           my_bind_addr_str, mysqld_port);
 

=== modified file 'sql/sys_vars.cc'
--- a/sql/sys_vars.cc	2012-04-13 12:00:39 +0000
+++ b/sql/sys_vars.cc	2012-04-27 15:23:58 +0000
@@ -536,7 +536,7 @@ static Sys_var_charptr Sys_basedir(
 static Sys_var_charptr Sys_my_bind_addr(
        "bind_address", "IP address to bind to.",
        READ_ONLY GLOBAL_VAR(my_bind_addr_str), CMD_LINE(REQUIRED_ARG),
-       IN_FS_CHARSET, DEFAULT(0));
+       IN_FS_CHARSET, DEFAULT("0.0.0.0"));
 
 static bool fix_binlog_cache_size(sys_var *self, THD *thd, enum_var_type type)
 {

No bundle (reason: useless for push emails).