1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

BUG#42829: manually merged approved bzr bundle from bug report.

Conflicts
=========

Text conflict in sql/sql_class.cc
1 conflicts encountered.
This commit is contained in:
Luis Soares
2009-11-01 23:13:11 +00:00
9 changed files with 169 additions and 5 deletions

View File

@ -3045,6 +3045,11 @@ extern "C" void thd_mark_transaction_to_rollback(MYSQL_THD thd, bool all)
{
mark_transaction_to_rollback(thd, all);
}
extern "C" bool thd_binlog_filter_ok(const MYSQL_THD thd)
{
return binlog_filter->db_ok(thd->db);
}
#endif // INNODB_COMPATIBILITY_HOOKS */
/****************************************************************************