bzr commit into mysql-6.0-falcon-team branch (john.embretsen:2789) Bug#40930

[John H. Embretsen]

#At file:///export/home/tmp/je159969/mysql-dev/bzr-repos/build-falcon-team-gcc/ based on
revid:john.embretsen@stripped

 2789 John H. Embretsen	2009-09-18
      Bug#40930 - rpl.rpl_extraCol_falcon fails doing STOP SLAVE.
      Applying fix for bug 40796 to 6.0-falcon-team branch, which should solve this issue.
      Re-enabling test cases that were disabled due to that bug.
      rpl_extraCol_falcon
      rpl_extraColmaster_innodb
      rpl_extraColmaster_myisam
     @ mysql-test/suite/rpl/t/disabled.def
        Re-enabling test cases that were disabled due to bug 40796.
     @ vio/vio.c
        Fix for bug no 40796 - Crash due to heap corruption in
rpl.rpl_extraColmaster_myisam.
        Original patch at http://lists.mysql.com/commits/79294.

    modified:
      mysql-test/suite/rpl/t/disabled.def
      vio/vio.c
=== modified file 'mysql-test/suite/rpl/t/disabled.def'
--- a/mysql-test/suite/rpl/t/disabled.def	2009-05-12 08:58:44 +0000
+++ b/mysql-test/suite/rpl/t/disabled.def	2009-09-18 07:17:54 +0000
@@ -10,10 +10,7 @@
 #
 ##############################################################################
 
-rpl_extraColmaster_innodb  : BUG#40796 2009-04-22 alfranio Crash due to heap corruption
in rpl.rpl_extraColmaster_myisam
-rpl_extraColmaster_myisam  : BUG#40796 2009-04-22 alfranio Crash due to heap corruption
in rpl.rpl_extraColmaster_myisam
 rpl_cross_version          : BUG#42311 2009-03-27 joro rpl_cross_version fails on macosx
-rpl_extraCol_falcon        : Bug#40930 2008-11-21 johnemb rpl.rpl_extraCol_falcon fails
doing STOP SLAVE (on Windows PB2)
 rpl_cross_version          : Bug#42311 2009-01-23 aelkin
 rpl_heartbeat_basic        : Bug#43828 Sporadic failures (Serge.Kozlov@stripped)
 rpl_heartbeat_2slaves      : Bug#43828 Sporadic failures (Serge.Kozlov@stripped)

=== modified file 'vio/vio.c'
--- a/vio/vio.c	2008-01-24 20:18:48 +0000
+++ b/vio/vio.c	2009-09-18 07:17:54 +0000
@@ -136,7 +136,7 @@ Vio *vio_new(my_socket sd, enum enum_vio
   Vio *vio;
   DBUG_ENTER("vio_new");
   DBUG_PRINT("enter", ("sd: %d", sd));
-  if ((vio = (Vio*) my_malloc(sizeof(*vio),MYF(MY_WME))))
+  if ((vio = (Vio*) my_malloc(sizeof(Vio),MYF(MY_WME))))
   {
     vio_init(vio, type, sd, 0, flags);
     sprintf(vio->desc,


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