bzr push into mysql-5.1 branch (frazer:3198 to 3199)

[Frazer Clement]

 3199 Frazer Clement	2009-01-08
      WL4562 IPv6 support for replication
      
      Fix bug with LOAD DATA FROM MASTER client side address binding.
modified:
  sql/repl_failsafe.cc

 3198 Frazer Clement	2009-01-08
      WL4562 IPv6 support for replication
      -----------------------------------
      Add IPv6 support to MySQLD, supporting IPv6 clients and replication over IPv6.
      
      - MySQLD is modified to bind to a socket using IPv6 compatible methods
      - Common client code is modified to bind to a socket using IPv6 compatible methods
      - MASTER_BIND option is modified to default to the empty string '' rather than 0.0.0.0.
      
      MySQLD server socket binding can be controlled via command line option.
      MySQLD server client socket (replication) binding can be controlled via MASTER_BIND option
      MySQL client socket binding can be controlled via command line option.
modified:
  include/violite.h
  mysql-test/suite/ndb_team/r/rpl_ndb_extraColMaster.result
  mysql-test/suite/parts/r/rpl_partition.result
  mysql-test/suite/rpl/r/rpl_000015.result
  mysql-test/suite/rpl/r/rpl_bug33931.result
  mysql-test/suite/rpl/r/rpl_change_master.result
  mysql-test/suite/rpl/r/rpl_deadlock_innodb.result
  mysql-test/suite/rpl/r/rpl_extraCol_innodb.result
  mysql-test/suite/rpl/r/rpl_extraCol_myisam.result
  mysql-test/suite/rpl/r/rpl_extraColmaster_innodb.result
  mysql-test/suite/rpl/r/rpl_extraColmaster_myisam.result
  mysql-test/suite/rpl/r/rpl_flushlog_loop.result
  mysql-test/suite/rpl/r/rpl_grant.result
  mysql-test/suite/rpl/r/rpl_heartbeat.result
  mysql-test/suite/rpl/r/rpl_incident.result
  mysql-test/suite/rpl/r/rpl_known_bugs_detection.result
  mysql-test/suite/rpl/r/rpl_loaddata.result
  mysql-test/suite/rpl/r/rpl_loaddata_fatal.result
  mysql-test/suite/rpl/r/rpl_log_pos.result
  mysql-test/suite/rpl/r/rpl_packet.result
  mysql-test/suite/rpl/r/rpl_rbr_to_sbr.result
  mysql-test/suite/rpl/r/rpl_replicate_do.result
  mysql-test/suite/rpl/r/rpl_rotate_logs.result
  mysql-test/suite/rpl/r/rpl_row_colSize.result
  mysql-test/suite/rpl/r/rpl_row_inexist_tbl.result
  mysql-test/suite/rpl/r/rpl_row_log.result
  mysql-test/suite/rpl/r/rpl_row_log_innodb.result
  mysql-test/suite/rpl/r/rpl_row_max_relay_size.result
  mysql-test/suite/rpl/r/rpl_row_reset_slave.result
  mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result
  mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result
  mysql-test/suite/rpl/r/rpl_row_until.result
  mysql-test/suite/rpl/r/rpl_server_id2.result
  mysql-test/suite/rpl/r/rpl_skip_error.result
  mysql-test/suite/rpl/r/rpl_slave_skip.result
  mysql-test/suite/rpl/r/rpl_ssl.result
  mysql-test/suite/rpl/r/rpl_ssl1.result
  mysql-test/suite/rpl/r/rpl_stm_log.result
  mysql-test/suite/rpl/r/rpl_stm_max_relay_size.result
  mysql-test/suite/rpl/r/rpl_stm_reset_slave.result
  mysql-test/suite/rpl/r/rpl_stm_until.result
  mysql-test/suite/rpl/r/rpl_temporary_errors.result
  mysql-test/suite/rpl_ndb/r/rpl_ndb_basic.result
  mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result
  mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result
  mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result
  mysql-test/suite/rpl_ndb/r/rpl_ndb_idempotent.result
  mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result
  sql-common/client.c
  sql/hostname.cc
  sql/mysql_priv.h
  sql/mysqld.cc
  sql/repl_failsafe.cc
  sql/rpl_mi.cc
  sql/sql_class.h
  sql/sql_connect.cc
  vio/vio.c
  vio/viosocket.c

=== modified file 'sql/repl_failsafe.cc'
--- a/sql/repl_failsafe.cc	2009-01-08 17:44:55 +0000
+++ b/sql/repl_failsafe.cc	2009-01-08 22:13:42 +0000
@@ -708,7 +708,7 @@ int connect_to_master(THD *thd, MYSQL* m
   mysql_options(mysql, MYSQL_OPT_CONNECT_TIMEOUT, (char *) &slave_net_timeout);
   mysql_options(mysql, MYSQL_OPT_READ_TIMEOUT, (char *) &slave_net_timeout);
 
-  if (mi->bind_addr)
+  if (mi->bind_addr && (mi->bind_addr[0] != 0))
   {
     DBUG_PRINT("info",("rpl failsafe BIND ADDR: %s",mi->bind_addr));
     mysql_options(mysql, MYSQL_OPT_BIND, mi->bind_addr);