From: Date: October 21 2008 10:52am
Subject: bzr commit into mysql-6.0 branch (kgeorge:2885)
List-Archive: http://lists.mysql.com/commits/56658
Message-Id: <200810210852.m9L8qKnO031578@magare.gmz>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///home/kgeorge/mysql/bzr/B38693-6.0-bugteam/

 2885 Georgi Kodinov	2008-10-21 [merge]
      merged 5.1-bugteam -> 6.0-bugteam
modified:
  sql/event_scheduler.cc
  sql/log.cc
  sql/sql_class.cc
  sql/sql_insert.cc

=== modified file 'sql/event_scheduler.cc'
--- a/sql/event_scheduler.cc	2008-05-08 16:01:15 +0000
+++ b/sql/event_scheduler.cc	2008-10-21 08:51:31 +0000
@@ -301,12 +301,6 @@ Event_worker_thread::run(THD *thd, Event
     goto end;
   }
 
-  sql_print_information("Event Scheduler: "
-                        "[%s].[%s.%s] started in thread %lu.",
-                        job_data.definer.str,
-                        job_data.dbname.str, job_data.name.str,
-                        thd->thread_id);
-
   thd->enable_slow_log= TRUE;
 
   res= job_data.execute(thd, event->dropped);
@@ -318,13 +312,6 @@ Event_worker_thread::run(THD *thd, Event
                           "[%s].[%s.%s] event execution failed.",
                           job_data.definer.str,
                           job_data.dbname.str, job_data.name.str);
-  else
-    sql_print_information("Event Scheduler: "
-                          "[%s].[%s.%s] executed successfully in thread %lu.",
-                          job_data.definer.str,
-                          job_data.dbname.str, job_data.name.str,
-                          thd->thread_id);
-
 end:
   DBUG_PRINT("info", ("Done with Event %s.%s", event->dbname.str,
              event->name.str));

=== modified file 'sql/log.cc'
--- a/sql/log.cc	2008-10-08 11:46:49 +0000
+++ b/sql/log.cc	2008-10-21 08:51:31 +0000
@@ -5111,7 +5111,7 @@ THD::binlog_set_pending_rows_event(Rows_
 int
 MYSQL_BIN_LOG::remove_pending_rows_event(THD *thd)
 {
-  DBUG_ENTER(__FUNCTION__);
+  DBUG_ENTER("MYSQL_BIN_LOG::remove_pending_rows_event");
 
   binlog_trx_data *const trx_data=
     (binlog_trx_data*) thd_get_ha_data(thd, binlog_hton);

=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	2008-10-08 15:29:55 +0000
+++ b/sql/sql_class.cc	2008-10-21 08:51:31 +0000
@@ -3517,7 +3517,7 @@ int THD::binlog_delete_row(TABLE* table,
 
 int THD::binlog_remove_pending_rows_event(bool clear_maps)
 {
-  DBUG_ENTER(__FUNCTION__);
+  DBUG_ENTER("THD::binlog_remove_pending_rows_event");
 
   if (!mysql_bin_log.is_open())
     DBUG_RETURN(0);

=== modified file 'sql/sql_insert.cc'
--- a/sql/sql_insert.cc	2008-10-15 08:30:05 +0000
+++ b/sql/sql_insert.cc	2008-10-21 08:51:31 +0000
@@ -2822,6 +2822,11 @@ bool Delayed_insert::handle_inserts(void
   /* Remove all not used rows */
   while ((row=rows.get()))
   {
+    if (table->s->blob_fields)
+    {
+      memcpy(table->record[0],row->record,table->s->reclength);
+      free_delayed_insert_blobs(table);
+    }
     delete row;
     thread_safe_increment(delayed_insert_errors,&LOCK_delayed_status);
     stacked_inserts--;