diff options
author | unknown <serg@serg.mylan> | 2006-01-03 17:54:54 +0100 |
---|---|---|
committer | unknown <serg@serg.mylan> | 2006-01-03 17:54:54 +0100 |
commit | 307c0b77a191a428c4bfdcba42b53872aa7c917f (patch) | |
tree | 2c671047ec7c4161ca04e53f5f54c6797f81afd4 /sql/sql_repl.cc | |
parent | 348efa52204e005abbf8d3c2610819c454fde9f5 (diff) | |
download | mariadb-git-307c0b77a191a428c4bfdcba42b53872aa7c917f.tar.gz |
many warnings (practically safe but annoying) corrected
client/mysqladmin.cc:
don't use the handler after it's closed
client/mysqlbinlog.cc:
memory leak
client/mysqldump.c:
many "ignore return value" warnings, one "NULL dereference"
cmd-line-utils/libedit/history.c:
memory leak
include/my_base.h:
cleanup
libmysql/libmysql.c:
"return value ignored" warning
myisam/mi_delete.c:
"return value ignored" warning
myisam/myisampack.c:
"out-of-bound access" warning
myisam/sort.c:
"double free" warning
mysys/default_modify.c:
"double free" warning
mysys/mf_iocache2.c:
"return value ignored" warnings
mysys/my_bitmap.c:
s/return/DBUG_RETURN/
mysys/my_error.c:
memory leak
server-tools/instance-manager/parse.cc:
"NULL dereference" warning
sql-common/client.c:
"NULL dereference" warning
sql/field.cc:
deadcode, "NULL dereference", "uninitialized" warnings
sql/field.h:
unused parameters removed from constructor
sql/ha_myisam.cc:
"return value ignored" warnings
sql/item.cc:
"return value ignored" warnings
changed constructor
sql/item_func.cc:
"return value ignored" warnings
sql/log_event.cc:
uninitialized warning
sql/opt_range.cc:
"double free" and uninitialized warnings
sql/opt_range.h:
"return value ignored" warning
sql/repl_failsafe.cc:
"return value ignored" warning
sql/set_var.cc:
"return value ignored" warning
sql/slave.cc:
"return value ignored" warnings
sql/slave.h:
new prototype
sql/sql_acl.cc:
deadcode and "NULL dereference" warnings
sql/sql_db.cc:
"return value ignored" warning
sql/sql_handler.cc:
"NULL dereference" warning
sql/sql_help.cc:
"NULL dereference" warning
sql/sql_insert.cc:
"return value ignored" warning
sql/sql_parse.cc:
"return value ignored" warning
one more DBUG_ASSERT
sql/sql_repl.cc:
"return value ignored" and memory leak warnings
sql/sql_show.cc:
"return value ignored" and "NULL dereference" warnings
sql/sql_test.cc:
"return value ignored" warning
sql/table.cc:
memory leak
sql/uniques.cc:
"return value ignored" warning
endspaces deleted
Diffstat (limited to 'sql/sql_repl.cc')
-rw-r--r-- | sql/sql_repl.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index cd293fc21c7..07678d97800 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1197,7 +1197,12 @@ bool change_master(THD* thd, MASTER_INFO* mi) Relay log's IO_CACHE may not be inited, if rli->inited==0 (server was never a slave before). */ - flush_master_info(mi, 0); + if (flush_master_info(mi, 0)) + { + my_error(ER_RELAY_LOG_INIT, MYF(0), "Failed to flush master info file"); + unlock_slave_threads(mi); + DBUG_RETURN(TRUE); + } if (need_relay_log_purge) { relay_log_purge= 1; @@ -1307,14 +1312,15 @@ bool mysql_show_binlog_events(THD* thd) bool ret = TRUE; IO_CACHE log; File file = -1; - Format_description_log_event *description_event= new - Format_description_log_event(3); /* MySQL 4.0 by default */ Log_event::init_show_field_list(&field_list); if (protocol->send_fields(&field_list, Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF)) DBUG_RETURN(TRUE); + Format_description_log_event *description_event= new + Format_description_log_event(3); /* MySQL 4.0 by default */ + if (mysql_bin_log.is_open()) { LEX_MASTER_INFO *lex_mi= &thd->lex->mi; |