Commit b391a522 authored by unknown's avatar unknown
Browse files

Merge dli@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj 

into  dev3-164.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-19896


sql/log_event.cc:
  Auto merged
sql/protocol.h:
  Auto merged
sql/slave.cc:
  Auto merged
parents a7500328 727ffbf3

sql/log_event.cc

+20 −3
Original line number Diff line number Diff line
@@ -5669,10 +5669,27 @@ int Rows_log_event::exec_event(st_relay_log_info *rli) 
                               rli->tables_to_lock_count, &need_reopen)))

    {

      if (!need_reopen)

      {

        if (thd->query_error || thd->is_fatal_error)

        {

          /*

            Error reporting borrowed from Query_log_event with many excessive

            simplifications (we don't honour --slave-skip-errors)

          */

          uint actual_error= thd->net.last_errno;

          slave_print_msg(ERROR_LEVEL, rli, actual_error,

                          "Error '%s' in %s event: when locking tables",

                          (actual_error ? thd->net.last_error :

                           "unexpected success or fatal error"),

                          get_type_str());

          thd->is_fatal_error= 1;

        }

        else

        {

          slave_print_msg(ERROR_LEVEL, rli, error,

                         "Error in %s event: when locking tables",

                         get_type_str());

        }

        rli->clear_tables_to_lock();

        DBUG_RETURN(error);

      }

sql/protocol.h

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,8 @@ class Protocol 
  String *storage_packet() { return packet; }

  inline void free() { packet->free(); }

  virtual bool write();

  inline  bool store(int from)

  { return store_long((longlong) from); }

  inline  bool store(uint32 from)

  { return store_long((longlong) from); }

  inline  bool store(longlong from)

sql/slave.cc

+1 −1
Original line number Diff line number Diff line
@@ -1295,7 +1295,7 @@ bool show_master_info(THD* thd, MASTER_INFO* mi) 
    rpl_filter->get_wild_ignore_table(&tmp);

    protocol->store(&tmp);



    protocol->store((uint32) mi->rli.last_slave_errno);

    protocol->store(mi->rli.last_slave_errno);

    protocol->store(mi->rli.last_slave_error, &my_charset_bin);

    protocol->store((uint32) mi->rli.slave_skip_counter);

    protocol->store((ulonglong) mi->rli.group_master_log_pos);