summaryrefslogtreecommitdiff
path: root/mysql-test/main/lock.result
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2018-10-31 22:52:29 +0200
committerMonty <monty@mariadb.org>2018-12-09 22:12:26 +0200
commit7fb9d64989ad8bb86ee47ded88dc5e2493aca4b8 (patch)
treea965ed7e10fc1bf4f0c1b052d3a653a6ec33ae47 /mysql-test/main/lock.result
parent7bb3a5220e9960c5b3c0fd44d656d26d45b3cdef (diff)
downloadmariadb-git-7fb9d64989ad8bb86ee47ded88dc5e2493aca4b8.tar.gz
Changed FLUSH TABLES to not change share version
Part of MDEV-5336 Implement LOCK FOR BACKUP Originally both table metadata lock and global read lock protection were acquired before getting TABLE from table cache. This will be reordered in a future commit with MDL_BACKUP_XXX locks so that we first take table metadata lock, then get TABLE from table cache, then acquire analogue of global read lock. This patch both simplifies FLUSH TABLES code, makes FLUSH TABLES to lock less and also enables FLUSH TABLES code to be used with backup locks. The usage of FLUSH TABLES changes slightly: - FLUSH TABLES without any arguments will now only close not used tables and tables locked by the FLUSH TABLES connection. All not used table shares will be closed. Tables locked by the FLUSH TABLES connection will be reopened and re-locked after all others has stoped using the table (as before). If there was no locked tables, then FLUSH TABLES is instant and will not cause any waits. FLUSH TABLES will not wait for any in use table. - FLUSH TABLES with a table list, will ensure that the tables are closed before statement returns. The code is now only using MDL locks and not table share versions, which simplices the code greatly. One visible change is that the server will wait for the end of the transaction that are using the tables. Before FLUSH TABLES only waited for the statements to end. Signed-off-by: Monty <monty@mariadb.org>
Diffstat (limited to 'mysql-test/main/lock.result')
-rw-r--r--mysql-test/main/lock.result2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/main/lock.result b/mysql-test/main/lock.result
index c49b7141634..6edb86bfa3f 100644
--- a/mysql-test/main/lock.result
+++ b/mysql-test/main/lock.result
@@ -500,7 +500,7 @@ connect con1,localhost,root,,test;
LOCK TABLE t2 WRITE;
SET lock_wait_timeout= 1;
FLUSH TABLES;
-ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+FLUSH TABLES t2;
UNLOCK TABLES;
disconnect con1;
connection default;