diff options
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 628b1775778..47b258d9ed2 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -910,6 +910,11 @@ int cmp_master_pos(const char* log_file_name1, ulonglong log_pos1, const char* log_file_name2, ulonglong log_pos2) { int res; + /* + TODO: Change compare function to work with file name of type + '.999 and .1000' + */ + if ((res = strcmp(log_file_name1, log_file_name2))) return res; if (log_pos1 > log_pos2) @@ -919,6 +924,7 @@ int cmp_master_pos(const char* log_file_name1, ulonglong log_pos1, return -1; } + int show_binlog_events(THD* thd) { DBUG_ENTER("show_binlog_events"); @@ -1010,15 +1016,16 @@ err: if (errmsg) { - net_printf(&thd->net, ER_ERROR_WHEN_EXECUTING_COMMAND, - "SHOW BINLOG EVENTS", errmsg); - DBUG_RETURN(1); + my_error(ER_ERROR_WHEN_EXECUTING_COMMAND, MYF(0), + "SHOW BINLOG EVENTS", errmsg); + DBUG_RETURN(-1); } send_eof(&thd->net); DBUG_RETURN(0); } + int show_binlog_info(THD* thd) { DBUG_ENTER("show_binlog_info"); |