summaryrefslogtreecommitdiff
path: root/mysql-test/r/innodb.result
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 /mysql-test/r/innodb.result
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 'mysql-test/r/innodb.result')
-rw-r--r--mysql-test/r/innodb.result1
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/r/innodb.result b/mysql-test/r/innodb.result
index 718e554b904..af39dbf51f1 100644
--- a/mysql-test/r/innodb.result
+++ b/mysql-test/r/innodb.result
@@ -256,7 +256,6 @@ start transaction;
insert into t1 values (4);
flush tables with read lock;
commit;
-ERROR HY000: Can't execute the query because you have a conflicting read lock
unlock tables;
commit;
select * from t1;