diff options
author | unknown <sasha@mysql.sashanet.com> | 2000-12-09 14:28:51 -0700 |
---|---|---|
committer | unknown <sasha@mysql.sashanet.com> | 2000-12-09 14:28:51 -0700 |
commit | 8beb43501be6bb4a4bd09e2b0aadc815dcc2f606 (patch) | |
tree | e1d361e164277c92682635c15be624dce98c7c72 /sql/slave.h | |
parent | 701af104149fc90dc61267a0dc0f67694c8ac40b (diff) | |
download | mariadb-git-8beb43501be6bb4a4bd09e2b0aadc815dcc2f606.tar.gz |
fixed up leaks found by --exit-info=256
better error diagnostic in SLAVE START
sql/mini_client.cc:
if we fail to connect, we need to free the inited structure
sql/mysqld.cc:
added end_slave() for slave cleanup
sql/slave.cc:
fixed serveral memory leaks
sql/slave.h:
added end_master_info() for clean up
sql/sql_class.cc:
not changed
sql/sql_repl.cc:
initialize master info before creating slave thread in SLAVE START -
this way we can easily send an error to the client if something is
wrong in init_master_info
Diffstat (limited to 'sql/slave.h')
-rw-r--r-- | sql/slave.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/slave.h b/sql/slave.h index b4fb16b4b07..c26be966fc3 100644 --- a/sql/slave.h +++ b/sql/slave.h @@ -26,7 +26,6 @@ typedef struct st_master_info { pthread_mutex_destroy(&lock); } - inline void inc_pending(ulonglong val) { pending += val; @@ -81,7 +80,9 @@ int add_wild_table_rule(DYNAMIC_ARRAY* a, const char* table_spec); void init_table_rule_hash(HASH* h, bool* h_inited); void init_table_rule_array(DYNAMIC_ARRAY* a, bool* a_inited); +void end_slave(); // clean up int init_master_info(MASTER_INFO* mi); +void end_master_info(MASTER_INFO* mi); extern bool opt_log_slave_updates ; pthread_handler_decl(handle_slave,arg); extern bool volatile abort_loop, abort_slave; |