summaryrefslogtreecommitdiff
path: root/sql/rpl_injector.h
diff options
context:
space:
mode:
authorunknown <knielsen@rt.int.sifira.dk>2006-06-23 15:05:15 +0200
committerunknown <knielsen@rt.int.sifira.dk>2006-06-23 15:05:15 +0200
commit83f16e31da4fac73343911c59ff8fef1b3dc556b (patch)
tree70f9d8c45d74bad9cd3290e4ab9cec191f872d23 /sql/rpl_injector.h
parent2deb5a611ab594d0601b2d3adbf67d5e9a2922ba (diff)
parent46d19b740926d22ffa7bd3a89be81164d09b366d (diff)
downloadmariadb-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.h')
-rw-r--r--sql/rpl_injector.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/rpl_injector.h b/sql/rpl_injector.h
index 3b0857e0833..48df30e8ac8 100644
--- a/sql/rpl_injector.h
+++ b/sql/rpl_injector.h
@@ -59,6 +59,11 @@ public:
*/
static injector *instance();
+ /*
+ Delete the singleton instance (if allocated). Used during server shutdown.
+ */
+ static void free_instance();
+
/*
A transaction where rows can be added.