summaryrefslogtreecommitdiff
path: root/mysql-test/r/lock.result
diff options
context:
space:
mode:
authorunknown <ingo@mysql.com>2006-01-23 19:12:29 +0100
committerunknown <ingo@mysql.com>2006-01-23 19:12:29 +0100
commit15ecf9228a3ba5e65f39cf87f941d0d997683dc6 (patch)
tree71007ca518f63cab8214fe281a3bc3abbaef3c1a /mysql-test/r/lock.result
parent2845da017e9a570b04d26ceaeb0c33d0fbe6fbd7 (diff)
downloadmariadb-git-15ecf9228a3ba5e65f39cf87f941d0d997683dc6.tar.gz
BUG#5390 - problems with merge tables
After-fix optimizations proposed and finally implemented by Monty. mysql-test/r/lock.result: BUG#5390 - problems with merge tables After-fix optimizations proposed and finally implemented by Monty. Additional test results. mysql-test/t/lock.test: BUG#5390 - problems with merge tables After-fix optimizations proposed and finally implemented by Monty. Additional tests. sql/lock.cc: BUG#5390 - problems with merge tables After-fix optimizations proposed and finally implemented by Monty. get_lock_data() gets a flag for storing the lock positions in the new TABLE elements. mysql_lock_remove() can now remove a lock faster and more precisely as it has needed info in TABLE now. mysql_unlock_read_tables() and mysql_lock_merge() must now adjust the new elements of TABLE when modifying locks. mysql_lock_have_duplicate() can now work faster on the existing lock as the positions in the lock arrays are known for each table. get_lock_data() assigns the new TABLE elements on request of the new flag. sql/table.h: BUG#5390 - problems with merge tables After-fix optimizations proposed and finally implemented by Monty. Additional elements of TABLE.
Diffstat (limited to 'mysql-test/r/lock.result')
-rw-r--r--mysql-test/r/lock.result11
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/r/lock.result b/mysql-test/r/lock.result
index 31a18fe6cec..923ab56d3af 100644
--- a/mysql-test/r/lock.result
+++ b/mysql-test/r/lock.result
@@ -47,3 +47,14 @@ unlock tables;
lock tables t1 write, t1 as t1_alias read;
insert into t1 select index1,nr from t1 as t1_alias;
drop table t1,t2;
+create table t1 (c1 int);
+create table t2 (c1 int);
+create table t3 (c1 int);
+lock tables t1 write, t2 write, t3 write;
+drop table t2, t3, t1;
+create table t1 (c1 int);
+create table t2 (c1 int);
+create table t3 (c1 int);
+lock tables t1 write, t2 write, t3 write, t1 as t4 read;
+alter table t2 add column c2 int;
+drop table t1, t2, t3;