bzr push into mysql-trunk branch (andrei.elkin:3667 to 3668) Bug#12964649

[Andrei Elkin]

 3668 Andrei Elkin	2011-12-21
      BUG#12964649
      fixing post-push valgrind issue: in case MTS worker cant start its private queue dynarray left undestroyed.

    modified:
      sql/rpl_slave.cc
 3667 Sneha Modi	2011-12-21 [merge]
      Bug#11754150:  A TEST CASE FOR BUG#6857 IS DISABLED IN SP.TEST
      
      merging from mysql-5.5 -> mysql-trunk

    modified:
      mysql-test/r/sp.result
      mysql-test/t/sp.test
=== modified file 'sql/rpl_slave.cc'
--- a/sql/rpl_slave.cc	2011-12-16 15:53:16 +0000
+++ b/sql/rpl_slave.cc	2011-12-21 10:29:44 +0000
@@ -4402,6 +4402,7 @@ err:
   if (error && w)
   {
     w->end_info();
+    delete_dynamic(&w->jobs.Q);
     delete w;
     /*
       Any failure after dynarray inserted must follow with deletion

No bundle (reason: useless for push emails).