bzr push into mysql-5.5-telco branch (magnus.blaudd:3124 to 3126)

[Magnus Blåudd]

 3126 Magnus Blåudd	2010-11-26
      ndb
      - backport fix for test case timeout on Windows caused by connecting to ipv4 master_host with ipv6 master_bind

    modified:
      mysql-test/suite/rpl/r/rpl_change_master.result
      mysql-test/suite/rpl/t/rpl_change_master_bind.inc
 3125 Magnus Blåudd	2010-11-26
      Cherry pick fix for shared_memory_base_name_basic from 5.5-bugteam

    modified:
      mysql-test/suite/sys_vars/r/shared_memory_base_name_basic.result
      mysql-test/suite/sys_vars/t/shared_memory_base_name_basic.test
      sql/sql_show.cc
 3124 Magnus Blåudd	2010-11-26 [merge]
      Merge

    modified:
      mysql-test/suite/rpl/t/rpl_change_master.test
      sql/rpl_mi.cc
=== modified file 'mysql-test/suite/rpl/r/rpl_change_master.result'
--- a/mysql-test/suite/rpl/r/rpl_change_master.result	2010-11-25 15:06:24 +0000
+++ b/mysql-test/suite/rpl/r/rpl_change_master.result	2010-11-26 14:02:56 +0000
@@ -38,13 +38,13 @@ drop table t1;
 include/stop_slave.inc
 create table t1(n int, b varchar(256));
 insert into t1 values(1, <master_bind>);
-change master to master_bind=<master_bind>;
+change master to master_host=<master_bind>, master_bind=<master_bind>;
 start slave;
 drop table t1;
 include/stop_slave.inc
 create table t1(n int, b varchar(256));
 insert into t1 values(1, <master_bind>);
-change master to master_bind=<master_bind>;
+change master to  master_bind=<master_bind>;
 start slave;
 got expected error 2003
 include/stop_slave.inc
@@ -54,12 +54,12 @@ drop table t1;
 include/stop_slave.inc
 create table t1(n int, b varchar(256));
 insert into t1 values(1, <master_bind>);
-change master to master_bind=<master_bind>;
+change master to master_host=<master_bind>, master_bind=<master_bind>;
 start slave;
 drop table t1;
 include/stop_slave.inc
 create table t1(n int, b varchar(256));
 insert into t1 values(1, <master_bind>);
-change master to master_bind=<master_bind>;
+change master to  master_bind=<master_bind>;
 start slave;
 drop table t1;

=== modified file 'mysql-test/suite/rpl/t/rpl_change_master_bind.inc'
--- a/mysql-test/suite/rpl/t/rpl_change_master_bind.inc	2010-11-25 15:06:24 +0000
+++ b/mysql-test/suite/rpl/t/rpl_change_master_bind.inc	2010-11-26 14:02:56 +0000
@@ -18,10 +18,19 @@ create table t1(n int, b varchar(256));
 --replace_result $master_bind <master_bind>
 eval insert into t1 values(1, $master_bind);
 
-# Configure slave to connect to master with then give bind address
+# Configure slave to connect to master with the give bind address
 connection slave;
+let $_master_host=;
+if (!$master_bind_error_expected)
+{
+  if (`select $master_bind != ''`)
+  {
+    let $_master_host=master_host=$master_bind,;
+  }
+}
+
 --replace_result $master_bind <master_bind>
-eval change master to master_bind=$master_bind;
+eval change master to $_master_host master_bind=$master_bind;
 start slave;
 
 # Check that SHOW SLAVE STATUS has Master_bind column set to $master_bind
@@ -42,7 +51,7 @@ if ($master_bind_error_expected)
   echo got expected error $master_bind_error_expected;
   source include/stop_slave.inc;
 
-  # Reset the master_bind to that cleanup can run
+  # Reset the master_bind so that cleanup can run
   eval change master to master_bind='';
   start slave;
 

=== modified file 'mysql-test/suite/sys_vars/r/shared_memory_base_name_basic.result'
--- a/mysql-test/suite/sys_vars/r/shared_memory_base_name_basic.result	2009-12-22 09:35:56 +0000
+++ b/mysql-test/suite/sys_vars/r/shared_memory_base_name_basic.result	2010-11-26 12:18:00 +0000
@@ -1,20 +1,20 @@
 select @@global.shared_memory_base_name;
 @@global.shared_memory_base_name
-MYSQLTEST_VARDIR/tmp/mysqld.1.sock
+MYSQL_TMP_DIR/mysqld.1.sock
 select @@session.shared_memory_base_name;
 ERROR HY000: Variable 'shared_memory_base_name' is a GLOBAL variable
 show global variables like 'shared_memory_base_name';
 Variable_name	Value
-shared_memory_base_name	MYSQLTEST_VARDIR/tmp/mysqld.1.sock
+shared_memory_base_name	MYSQL_TMP_DIR/mysqld.1.sock
 show session variables like 'shared_memory_base_name';
 Variable_name	Value
-shared_memory_base_name	MYSQLTEST_VARDIR/tmp/mysqld.1.sock
+shared_memory_base_name	MYSQL_TMP_DIR/mysqld.1.sock
 select * from information_schema.global_variables where variable_name='shared_memory_base_name';
 VARIABLE_NAME	VARIABLE_VALUE
-SHARED_MEMORY_BASE_NAME	MYSQLTEST_VARDIR/tmp/mysqld.1.sock
+SHARED_MEMORY_BASE_NAME	MYSQL_TMP_DIR/mysqld.1.sock
 select * from information_schema.session_variables where variable_name='shared_memory_base_name';
 VARIABLE_NAME	VARIABLE_VALUE
-SHARED_MEMORY_BASE_NAME	MYSQLTEST_VARDIR/tmp/mysqld.1.sock
+SHARED_MEMORY_BASE_NAME	MYSQL_TMP_DIR/mysqld.1.sock
 set global shared_memory_base_name=1;
 ERROR HY000: Variable 'shared_memory_base_name' is a read only variable
 set session shared_memory_base_name=1;

=== modified file 'mysql-test/suite/sys_vars/t/shared_memory_base_name_basic.test'
--- a/mysql-test/suite/sys_vars/t/shared_memory_base_name_basic.test	2010-02-21 14:10:52 +0000
+++ b/mysql-test/suite/sys_vars/t/shared_memory_base_name_basic.test	2010-11-26 12:18:00 +0000
@@ -3,17 +3,17 @@
 #
 # only global
 #
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
 select @@global.shared_memory_base_name;
 --error ER_INCORRECT_GLOBAL_LOCAL_VAR
 select @@session.shared_memory_base_name;
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
 show global variables like 'shared_memory_base_name';
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
 show session variables like 'shared_memory_base_name';
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
 select * from information_schema.global_variables where variable_name='shared_memory_base_name';
---replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--replace_result $MYSQL_TMP_DIR MYSQL_TMP_DIR
 select * from information_schema.session_variables where variable_name='shared_memory_base_name';
 
 #

=== modified file 'sql/sql_show.cc'
--- a/sql/sql_show.cc	2010-11-26 06:59:16 +0000
+++ b/sql/sql_show.cc	2010-11-26 12:18:00 +0000
@@ -604,7 +604,7 @@ public:
                         MYSQL_ERROR::enum_warning_level level,
                         const char *message, MYSQL_ERROR ** /* cond_hdl */)
   {
-    /* 
+    /*
        The handler does not handle the errors raised by itself.
        At this point we know if top_view is really a view.
     */
@@ -614,7 +614,7 @@ public:
     m_handling= TRUE;
 
     bool is_handled;
-    
+
     switch (sql_errno)
     {
     case ER_TABLEACCESS_DENIED_ERROR:

No bundle (reason: useless for push emails).