bzr push into mysql-trunk branch (tatjana.nuernberg:4023 to 4024) Bug#13431369

[Tatjana Azundris Nuernberg]

 4024 Tatjana Azundris Nuernberg	2012-06-15
      aftermath of Bug#13431369: MAIN.VARIABLES-NOTEMBEDDED CRASHES THE SERVER SPORADICALLY ON WINDOWS
      
      turn test case back on.
     @ mysql-test/t/disabled.def
        turn variables-notembedded.test back on
     @ mysql-test/t/variables-notembedded.test
        2013=CR_SERVER_LOST -- on Windows the line can drop before the client sees
        the error code. We just proceed. In the hypothetical case of the server
        actually crashing, the test would fail at the next statement (on connection
        "default").
        Normally, 2013 appears in conjunction with 2006=CR_SERVER_GONE_ERROR, but
        we shouldn't need that here -- either the connection drops in the middle
        of the query, or we receive the proper error message, ER_NET_PACKET_TOO_LARGE.

    modified:
      mysql-test/t/disabled.def
      mysql-test/t/variables-notembedded.test
 4023 Nuno Carvalho	2012-06-15
      BUG#13635612: VALGRIND ERRORS IN REPLICATION
      
      There was a possible memory leak when multi thread slave coordinator is
      waiting for successful job enqueue on worker queue and slave is stopped 
      (3rd error on bug report).
      
      Ensure that when job enqueue on worker is interrupted the current event
      is deleted and the error propagated to coordinator.
      
      @ sql/rpl_info_factory.cc
         Slave_worker::end_info() now is private.
      @ sql/rpl_rli_pdb.h
         Removal of unused code and make Slave_worker::end_info() private, now
         it is implicitly called by Slave_worker destructor.
      @ sql/rpl_rli_pdb.cc
         Refactored Slave_worker destructor to call end_info() and free worker
         jobs queues.
         Changed append_item_to_jobs() in order to inform caller when it is 
         interrupted.
      @ sql/rpl_slave.cc
         Ensure that slave_start_workers() and slave_stop_workers() have proper
         mutex locked.
         Changed apply_event_and_update_pos() in order to take in account 
         possible append_item_to_jobs() interruptions.

    modified:
      sql/rpl_info_factory.cc
      sql/rpl_rli_pdb.cc
      sql/rpl_rli_pdb.h
      sql/rpl_slave.cc
=== modified file 'mysql-test/t/disabled.def'
--- a/mysql-test/t/disabled.def	2012-06-08 11:39:00 +0000
+++ b/mysql-test/t/disabled.def	2012-06-15 21:11:49 +0000
@@ -17,4 +17,3 @@ log_tables-big           : Bug#11756699
 ds_mrr-big @solaris      : Bug#14168107 2012-04-03 Hemant disabled new test added by Olav Sandstå,since this leads to timeout on Solaris on slow sparc servers
 partition_locking_4	 : Bug#13924750 2012-04-04 lost connection.
 mysql_embedded_client_test	: Bug#13964673 2012-04-16 amitbha since most of the test cases are failing
-variables-notembedded    : Bug#13431369 2012-05-24 tnuernberg POSIX shutdown() broken on Windows, need workaround

=== modified file 'mysql-test/t/variables-notembedded.test'
--- a/mysql-test/t/variables-notembedded.test	2011-03-28 11:10:42 +0000
+++ b/mysql-test/t/variables-notembedded.test	2012-06-15 21:11:49 +0000
@@ -153,7 +153,7 @@ CONNECT (con1,localhost,root,,test);
 SHOW SESSION VARIABLES LIKE 'max_allowed_packet';
 SHOW SESSION VARIABLES LIKE 'net_buffer_length';
 --disable_query_log
---error ER_NET_PACKET_TOO_LARGE
+--error ER_NET_PACKET_TOO_LARGE,2013
 INSERT INTO t1 VALUES ('123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890');
 --enable_query_log
 

No bundle (reason: useless for push emails).