Commit bf95f919 authored by unknown's avatar unknown
Browse files

Merge gbichot@213.136.52.20:/home/bk/mysql-4.1 

into mysql.com:/home/mysql_src/mysql-4.1-874
parents 325de4eb 5a37da8e

sql/log_event.cc

+12 −0
Original line number Diff line number Diff line
@@ -1702,6 +1702,11 @@ int Load_log_event::exec_event(NET* net, struct st_relay_log_info* rli, 
  thd->query_length= 0;                         // Should not be needed

  thd->query_error= 0;

  clear_all_errors(thd, rli);

  /*

    Usually mysql_init_query() is called by mysql_parse(), but we need it here

    as the present method does not call mysql_parse().

  */

  mysql_init_query(thd);

  if (!use_rli_only_for_errors)

  {

#if MYSQL_VERSION_ID < 50000
@@ -1730,6 +1735,13 @@ int Load_log_event::exec_event(NET* net, struct st_relay_log_info* rli, 
    VOID(pthread_mutex_lock(&LOCK_thread_count));

    thd->query_id = query_id++;

    VOID(pthread_mutex_unlock(&LOCK_thread_count));

    /*

      Initing thd->row_count is not necessary in theory as this variable has no

      influence in the case of the slave SQL thread (it is used to generate a

      "data truncated" warning but which is absorbed and never gets to the

      error log); still we init it to avoid a Valgrind message.

    */

    mysql_reset_errors(thd);



    TABLE_LIST tables;

    bzero((char*) &tables,sizeof(tables));