1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/home/svoj/devel/mysql/cov/mysql-5.0-engines

Browse Source 
into  mysql.com:/home/svoj/devel/mysql/cov/mysql-5.1-engines


sql/log_event.cc:
  Auto merged
sql/repl_failsafe.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged
This commit is contained in:
unknown 2008-03-18 16:39:33 +04:00
commit ca629f8618
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/log_event.cc
View File

@ -636,7 +636,7 @@ Log_event::Log_event(const char* buf,
binlog, so which will cause problems if the user uses this value binlog, so which will cause problems if the user uses this value
in CHANGE MASTER). in CHANGE MASTER).
*/ */
log_pos+= data_written; log_pos+= data_written; /* purecov: inspected */
} }
DBUG_PRINT("info", ("log_pos: %lu", (ulong) log_pos)); DBUG_PRINT("info", ("log_pos: %lu", (ulong) log_pos));

2
sql/repl_failsafe.cc
View File

@ -201,7 +201,7 @@ int register_slave(THD* thd, uchar* packet, uint packet_length)
err: err:
my_free(si, MYF(MY_WME)); my_free(si, MYF(MY_WME));
my_message(ER_UNKNOWN_ERROR, errmsg, MYF(0)); my_message(ER_UNKNOWN_ERROR, errmsg, MYF(0)); /* purecov: inspected */
err2: err2:
return 1; return 1;
} }