bzr push into mysql-5.5 branch (manish.4.kumar:3783 to 3784) Bug#13917335

[Manish Kumar]

 3784 Manish Kumar	2012-04-10
      BUG#13917335 - ASSERTION `REPORT_PORT != 0' FAILED IN NETWORK_INIT ()
      
      Problem - The cause of the failure is mainly due to the assert added in
                the code as a result of the fix of the BUG-13333431. When we
                start the server with the --skip-networking option enabled
                we have the mysqld_port explicitly to 0. Since the value of
                report_port is set to mysqld_port, the assertion that
                (report_port!= 0) fails.
      
      Fix - the fix of the problem is to assert the not zero value of
            report_port only in the case the --skip-networking option is not
            used to start the mysqld server.
     @ sql/mysqld.cc
        Added the code to check for the skip-networking option while starting
        the server.

    modified:
      sql/mysqld.cc
 3783 Manish Kumar	2012-04-10
      BUG#13812374 - RPL.RPL_REPORT_PORT FAILS OCCASIONALLY ON PB2
      
      Problem - this failure occured in the test added for the fix of the 
                bug-13333431. The basic problem of the failure was the 
                value of the report_port which persisted even after the end 
                of the test (ie. rpl_end.inc). So this causes the assertion 
                in the test to fail if it is executed again.
      
      Fix - restarted the server with the default value being passed to the 
            report_port after testing the two expected case so that in the 
            next run of the test we will not encounter the previous value of
            report_port.
     @ mysql-test/suite/rpl/r/rpl_report_port.result
        Updated the corresponding result file.
     @ mysql-test/suite/rpl/t/rpl_report_port-slave.opt
        Removed the slave option file.
     @ mysql-test/suite/rpl/t/rpl_report_port.test
        Added the restart server option before ending the test.

    removed:
      mysql-test/suite/rpl/t/rpl_report_port-slave.opt
    modified:
      mysql-test/suite/rpl/r/rpl_report_port.result
      mysql-test/suite/rpl/t/rpl_report_port.test
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2012-04-04 05:43:42 +0000
+++ b/sql/mysqld.cc	2012-04-10 10:45:06 +0000
@@ -1830,7 +1830,12 @@ static void network_init(void)
   {
     report_port= mysqld_port;
   }
-  DBUG_ASSERT(report_port != 0);
+
+#ifndef DBUG_OFF
+  if (!opt_disable_networking)
+    DBUG_ASSERT(report_port != 0);
+#endif
+
   if (mysqld_port != 0 && !opt_disable_networking && !opt_bootstrap)
   {
     struct addrinfo *ai, *a;

No bundle (reason: useless for push emails).