diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-01-30 15:11:36 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-01-30 15:11:36 +0100 |
| commit | ea5632e9d767f1c4d07cb2dae74ec79bec843b7d (patch) | |
| tree | 135ea4b71d1dfeee1080f59976519c114cc5bbc3 /sql/sql_repl.h | |
| parent | 6f2680a73c54a5c676f80f6b86c1985aced1dfe4 (diff) | |
| download | mariadb-git-ea5632e9d767f1c4d07cb2dae74ec79bec843b7d.tar.gz | |
MDEV-3984: Double free of Master_info * when CHANGE MASTER fails.
When CHANGE MASTER fails, it may or may not have already added
the Master_info * to the index. Implement logic that properly
handles removal and freeing in both cases.
Diffstat (limited to 'sql/sql_repl.h')
| -rw-r--r-- | sql/sql_repl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_repl.h b/sql/sql_repl.h index c5a0b31388e..9ca7e6b00b1 100644 --- a/sql/sql_repl.h +++ b/sql/sql_repl.h @@ -41,7 +41,7 @@ extern my_bool opt_sporadic_binlog_dump_fail; int start_slave(THD* thd, Master_info* mi, bool net_report); int stop_slave(THD* thd, Master_info* mi, bool net_report); -bool change_master(THD* thd, Master_info* mi); +bool change_master(THD* thd, Master_info* mi, bool *master_info_added); bool mysql_show_binlog_events(THD* thd); int reset_slave(THD *thd, Master_info* mi); int reset_master(THD* thd); |