bzr commit into mysql-5.1-telco-6.2 branch (aelkin:3053) Bug#47037

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/MERGE/mysql-5.1-telco-6.2/ based on revid:aelkin@stripped

 3053 Andrei Elkin	2009-12-16
      bug#47037
      fixing master_server_id to stay initially 0

    modified:
      mysql-test/suite/rpl/r/rpl_000015.result
      mysql-test/suite/rpl/r/rpl_bug33931.result
      sql/rpl_mi.cc
=== modified file 'mysql-test/suite/rpl/r/rpl_000015.result'
--- a/mysql-test/suite/rpl/r/rpl_000015.result	2009-12-15 17:43:17 +0000
+++ b/mysql-test/suite/rpl/r/rpl_000015.result	2009-12-16 14:08:16 +0000
@@ -45,7 +45,7 @@ Last_IO_Error	#
 Last_SQL_Errno	0
 Last_SQL_Error	
 Replicate_Ignore_Server_Ids	
-Master_Server_Id	4294967295
+Master_Server_Id	0
 change master to master_host='127.0.0.1',master_user='root',
 master_password='',master_port=MASTER_PORT;
 SHOW SLAVE STATUS;
@@ -88,7 +88,7 @@ Last_IO_Error	#
 Last_SQL_Errno	0
 Last_SQL_Error	
 Replicate_Ignore_Server_Ids	
-Master_Server_Id	4294967295
+Master_Server_Id	0
 start slave;
 SHOW SLAVE STATUS;
 Slave_IO_State	#

=== modified file 'mysql-test/suite/rpl/r/rpl_bug33931.result'
--- a/mysql-test/suite/rpl/r/rpl_bug33931.result	2009-12-15 17:43:17 +0000
+++ b/mysql-test/suite/rpl/r/rpl_bug33931.result	2009-12-16 14:08:16 +0000
@@ -44,5 +44,5 @@ Last_IO_Error	
 Last_SQL_Errno	#
 Last_SQL_Error	Failed during slave thread initialization
 Replicate_Ignore_Server_Ids	
-Master_Server_Id	4294967295
+Master_Server_Id	0
 SET GLOBAL debug="";

=== modified file 'sql/rpl_mi.cc'
--- a/sql/rpl_mi.cc	2009-12-15 15:02:25 +0000
+++ b/sql/rpl_mi.cc	2009-12-16 14:08:16 +0000
@@ -34,7 +34,7 @@ int init_dynarray_intvar_from_file(DYNAM
 Master_info::Master_info()
   :Slave_reporting_capability("I/O"),
    ssl(0), ssl_verify_server_cert(0), fd(-1), io_thd(0), inited(0),
-   abort_slave(0), slave_running(0), master_id(-1),
+   abort_slave(0), slave_running(0), master_id(0),
    slave_run_id(0)
 {
   host[0] = 0; user[0] = 0; password[0] = 0;


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