summaryrefslogtreecommitdiff
path: root/sql/handler.cc
diff options
context:
space:
mode:
authorunknown <monty@narttu.mysql.fi>2003-10-08 21:50:05 +0300
committerunknown <monty@narttu.mysql.fi>2003-10-08 21:50:05 +0300
commitd1d07c99d7dc1f443776a48e66aa471b3b4535e4 (patch)
treecaac541df5c696ac2dd3b9e21880442e8961b4dc /sql/handler.cc
parent44e3cbcfeb14dd45b2eea154a8a602a5851cfac9 (diff)
downloadmariadb-git-d1d07c99d7dc1f443776a48e66aa471b3b4535e4.tar.gz
Indentation cleanups
Remove wait_if_global_read_lock on commit as this can cause deadlocks BUILD/FINISH.sh: Cleanup BUILD/SETUP.sh: Cleanup BUILD/compile-pentium-valgrind-max: Don't write message twice mysql-test/r/innodb.result: Removed failure as this can cause deadlocks mysql-test/r/rpl_max_relay_size.result: Make test repeatable mysql-test/t/innodb.test: Removed failure as this can cause deadlocks mysql-test/t/rpl_max_relay_size.test: Removed failure as this can cause deadlocks sql/handler.cc: Remove wait_if_global_read_lock as this can cause deadlocks sql/opt_range.cc: Indentation cleanup sql/sql_db.cc: Comment cleanup sql/sql_parse.cc: Comment cleanup sql/sql_repl.cc: Indentation cleanup sql/sql_select.cc: Indentation cleanup
Diffstat (limited to 'sql/handler.cc')
-rw-r--r--sql/handler.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/sql/handler.cc b/sql/handler.cc
index e14e326792d..a8e9f9cf50a 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -359,10 +359,7 @@ int ha_commit_trans(THD *thd, THD_TRANS* trans)
if (trans == &thd->transaction.all && mysql_bin_log.is_open() &&
my_b_tell(&thd->transaction.trans_log))
{
- if (wait_if_global_read_lock(thd, 0))
- DBUG_RETURN(1);
mysql_bin_log.write(thd, &thd->transaction.trans_log, 1);
- start_waiting_global_read_lock(thd);
reinit_io_cache(&thd->transaction.trans_log,
WRITE_CACHE, (my_off_t) 0, 0, 1);
thd->transaction.trans_log.end_of_file= max_binlog_cache_size;