database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge bk@192.168.21.1:mysql-5.1-opt

Browse Source 
into  mysql.com:/home/hf/work/28757/my51-28757
This commit is contained in:
unknown
2007-06-12 18:33:49 +05:00
parent 023f3dd0df 0a67a6e5b6
commit acc7614a86
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mysql-test/include/unsafe_binlog.inc
View File

@ -23,7 +23,7 @@
# #
--disable_warnings --disable_warnings
drop table if exists t1,t2; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9,t10;
--enable_warnings --enable_warnings
eval create table t1 (id int not null, f_id int not null, f int not null, eval create table t1 (id int not null, f_id int not null, f int not null,
primary key(f_id, id)) engine = $engine_type; primary key(f_id, id)) engine = $engine_type;
@ -59,7 +59,7 @@ set autocommit = 0;
# #
# S-lock to records (2,2),(4,2), and (6,2) should not be released in a update # S-lock to records (2,2),(4,2), and (6,2) should not be released in a update
# #
--error 1205 --error ER_LOCK_WAIT_TIMEOUT
select * from t1 where a = 2 and b = 2 for update; select * from t1 where a = 2 and b = 2 for update;
connection a; connection a;
commit; commit;
@ -213,39 +213,39 @@ set autocommit = 0;
create table t10(a int not null, b int, primary key(a)) select * from t2 for update; create table t10(a int not null, b int, primary key(a)) select * from t2 for update;
connection b; connection b;
--error 1205 --error ER_LOCK_WAIT_TIMEOUT
reap; reap;
connection c; connection c;
--error 1205 --error ER_LOCK_WAIT_TIMEOUT
reap; reap;
connection d; connection d;
--error 1205 --error ER_LOCK_WAIT_TIMEOUT
reap; reap;
connection e; connection e;
--error 1205 --error ER_LOCK_WAIT_TIMEOUT
reap; reap;
connection f; connection f;
--error 1205 --error ER_LOCK_WAIT_TIMEOUT
reap; reap;
connection g; connection g;
--error 1205 --error ER_LOCK_WAIT_TIMEOUT
reap; reap;
connection h; connection h;
--error 1205 --error ER_LOCK_WAIT_TIMEOUT
reap; reap;
connection i; connection i;
--error 1205 --error ER_LOCK_WAIT_TIMEOUT
reap; reap;
connection j; connection j;
--error 1205 --error ER_LOCK_WAIT_TIMEOUT
reap; reap;
connection a; connection a;

2
mysql-test/r/unsafe_binlog_innodb.result
View File

@ -1,4 +1,4 @@
drop table if exists t1,t2; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9,t10;
create table t1 (id int not null, f_id int not null, f int not null, create table t1 (id int not null, f_id int not null, f int not null,
primary key(f_id, id)) engine = InnoDB; primary key(f_id, id)) engine = InnoDB;
create table t2 (id int not null,s_id int not null,s varchar(200), create table t2 (id int not null,s_id int not null,s varchar(200),