1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00

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
This commit is contained in:
unknown
2006-06-23 15:05:15 +02:00
6 changed files with 36 additions and 7 deletions

View File

@ -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)