bzr commit into mysql-5.1 branch (aelkin:2656) Bug#33029, Bug#36443

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/FIXES/bug36443-slave_crash_insert_trigger/

 2656 Andrei Elkin	2008-06-17
      correcting the scope of declarion for a being appened to Discrete_interval item.
modified:
  sql/slave.cc
  sql/structs.h

per-file messages:
  sql/slave.cc
    forcing to execute special logics implemented for bug#33029 if
    simulate_bug33029 the debug option is set.
  sql/structs.h
    converting automatic allocation of a being item to Discrete_interval to dynamic.
=== modified file 'sql/slave.cc'
--- a/sql/slave.cc	2008-03-31 08:57:18 +0000
+++ b/sql/slave.cc	2008-06-17 13:34:14 +0000
@@ -4136,6 +4136,7 @@ bool rpl_master_erroneous_autoinc(THD *t
   if (active_mi && active_mi->rli.sql_thd == thd)
   {
     Relay_log_info *rli= &active_mi->rli;
+    DBUG_EXECUTE_IF("simulate_bug33029", return TRUE;);
     return rpl_master_has_bug(rli, 33029, FALSE);
   }
   return FALSE;

=== modified file 'sql/structs.h'
--- a/sql/structs.h	2008-03-14 03:35:41 +0000
+++ b/sql/structs.h	2008-06-17 13:34:14 +0000
@@ -320,8 +320,8 @@ private:
   {
     for (Discrete_interval *i= from.head; i; i= i->next)
     {
-      Discrete_interval j= *i;
-      append(&j);
+      Discrete_interval *j= new Discrete_interval(*i);
+      append(j);
     }
   }
 public: