summaryrefslogtreecommitdiff
path: root/sql/sql_class.cc
diff options
context:
space:
mode:
authorLuis Soares <luis.soares@sun.com>2009-11-01 23:13:11 +0000
committerLuis Soares <luis.soares@sun.com>2009-11-01 23:13:11 +0000
commit2ad0d6910cf7476c08e7a4fb77e30c959ffa0e80 (patch)
treebd5dd194e776b9de2507c0b9b21f46cfcb0a6207 /sql/sql_class.cc
parentd395e824ad5fd22d33112d0509bdca50aff6439f (diff)
parent9ae9f84ef45b57e29c328f9449004c07f8a62e3a (diff)
downloadmariadb-git-2ad0d6910cf7476c08e7a4fb77e30c959ffa0e80.tar.gz
BUG#42829: manually merged approved bzr bundle from bug report.
Conflicts ========= Text conflict in sql/sql_class.cc 1 conflicts encountered.
Diffstat (limited to 'sql/sql_class.cc')
-rw-r--r--sql/sql_class.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc
index ddcd1cee4e9..a12b0198c98 100644
--- a/sql/sql_class.cc
+++ b/sql/sql_class.cc
@@ -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 */
/****************************************************************************