diff options
| author | unknown <knielsen@rt.int.sifira.dk> | 2006-06-23 15:05:15 +0200 |
|---|---|---|
| committer | unknown <knielsen@rt.int.sifira.dk> | 2006-06-23 15:05:15 +0200 |
| commit | 83f16e31da4fac73343911c59ff8fef1b3dc556b (patch) | |
| tree | 70f9d8c45d74bad9cd3290e4ab9cec191f872d23 /sql/rpl_injector.cc | |
| parent | 2deb5a611ab594d0601b2d3adbf67d5e9a2922ba (diff) | |
| parent | 46d19b740926d22ffa7bd3a89be81164d09b366d (diff) | |
| download | mariadb-git-83f16e31da4fac73343911c59ff8fef1b3dc556b.tar.gz | |
Merge mysql.com:/usr/local/mysql/mysql-5.1-vg-apr2
into mysql.com:/usr/local/mysql/tmp-5.1
server-tools/instance-manager/instance_options.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/rpl_injector.cc:
Auto merged
sql/rpl_injector.h:
Auto merged
Diffstat (limited to 'sql/rpl_injector.cc')
| -rw-r--r-- | sql/rpl_injector.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sql/rpl_injector.cc b/sql/rpl_injector.cc index ec0add4165f..5a74fd58755 100644 --- a/sql/rpl_injector.cc +++ b/sql/rpl_injector.cc @@ -155,6 +155,16 @@ injector *injector::instance() 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) |