diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-01-31 15:04:37 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-01-31 21:51:45 +0100 |
| commit | 863cfb3fa5153e7754279324ba7e66a4cfdac805 (patch) | |
| tree | a1eac5e06bb16f03703f03d40cfb203646e49c0b /sql/handler.cc | |
| parent | b050354ffb15e4e27498b169ec723da4d8aa8da6 (diff) | |
| download | mariadb-git-863cfb3fa5153e7754279324ba7e66a4cfdac805.tar.gz | |
small cleanup, remove a useless function
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index cded7fb8cd8..637f27c2ac1 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -32,7 +32,6 @@ #include "sql_acl.h" // SUPER_ACL #include "sql_base.h" // free_io_cache #include "discover.h" // extension_based_table_discovery, etc -#include "log.h" // for assert_LOCK_log_owner #include "log_event.h" // *_rows_log_event #include "create_options.h" #include "rpl_filter.h" @@ -1479,9 +1478,8 @@ int ha_commit_trans(THD *thd, bool all) done: DBUG_EXECUTE_IF("crash_commit_after", DBUG_SUICIDE();); - /* documentation of which mutexes are (not) owned */ mysql_mutex_assert_not_owner(&LOCK_prepare_ordered); - assert_LOCK_log_owner(false); + mysql_mutex_assert_not_owner(mysql_bin_log.get_log_lock()); mysql_mutex_assert_not_owner(&LOCK_after_binlog_sync); mysql_mutex_assert_not_owner(&LOCK_commit_ordered); RUN_HOOK(transaction, after_commit, (thd, FALSE)); |