Commit 0efc834e authored by istruewing@stella.local's avatar istruewing@stella.local
Browse files

Merge stella.local:/home2/mydev/mysql-5.0-ateam 

into  stella.local:/home2/mydev/mysql-5.0-axmrg
parents f560b8c8 70ca2ae2

sql/log_event.cc

+1 −1
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ Log_event::Log_event(const char* buf, 
        binlog, so which will cause problems if the user uses this value

        in CHANGE MASTER).

      */

    log_pos+= data_written;

    log_pos+= data_written; /* purecov: inspected */

  }

  DBUG_PRINT("info", ("log_pos: %lu", (ulong) log_pos));

sql/repl_failsafe.cc

+1 −1
Original line number Diff line number Diff line
@@ -191,7 +191,7 @@ int register_slave(THD* thd, uchar* packet, uint packet_length) 


err:

  my_free((gptr) si, MYF(MY_WME));

  my_message(ER_UNKNOWN_ERROR, errmsg, MYF(0));

  my_message(ER_UNKNOWN_ERROR, errmsg, MYF(0)); /* purecov: inspected */

err2:

  return 1;

}