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

Fix a Valgrind leak error report for not freed binlog injector singleton.

Browse Source 
sql/mysqld.cc:
  Free the binlog injector singleton during shutdown.
sql/rpl_injector.cc:
  Add free_instance() method.
sql/rpl_injector.h:
  Add free_instance() method.
This commit is contained in:
unknown 2006-06-19 14:31:22 +02:00
parent 78deb348f0
commit cb28cf8d88
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sql/mysqld.cc
View File

@ -28,6 +28,10 @@
#include "ha_myisam.h" #include "ha_myisam.h"
#ifdef HAVE_ROW_BASED_REPLICATION
#include "rpl_injector.h"
#endif
#ifdef WITH_INNOBASE_STORAGE_ENGINE #ifdef WITH_INNOBASE_STORAGE_ENGINE
#define OPT_INNODB_DEFAULT 1 #define OPT_INNODB_DEFAULT 1
#else #else
@ -1183,6 +1187,9 @@ void clean_up(bool print_message)
what they have that is dependent on the binlog what they have that is dependent on the binlog
*/ */
ha_binlog_end(current_thd); ha_binlog_end(current_thd);
#ifdef HAVE_ROW_BASED_REPLICATION
injector::free_instance();
#endif
mysql_bin_log.cleanup(); mysql_bin_log.cleanup();
#ifdef HAVE_REPLICATION #ifdef HAVE_REPLICATION

10
sql/rpl_injector.cc
View File

@ -155,6 +155,16 @@ injector *injector::instance()
return s_injector; return s_injector;
} }
void injector::free_instance()
{
injector *inj = s_injector;
if (inj != 0)
{
s_injector= 0;
delete inj;
}
}
injector::transaction injector::new_trans(THD *thd) injector::transaction injector::new_trans(THD *thd)

5
sql/rpl_injector.h
View File

@ -59,6 +59,11 @@ public:
*/ */
static injector *instance(); static injector *instance();
/*
Delete the singleton instance (if allocated). Used during server shutdown.
*/
static void free_instance();
/* /*
A transaction where rows can be added. A transaction where rows can be added.