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

Merge shellback.(none):/home/msvensson/mysql/same_tools/my41-same_tools

Browse Source 
into  shellback.(none):/home/msvensson/mysql/same_tools/my50-same_tools
This commit is contained in:
msvensson@shellback.(none)
2006-10-03 16:14:23 +02:00
parent 4e97643423 8f3fbd2625
commit de8bc06266
31 changed files with 4096 additions and 2723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -195,7 +195,7 @@ select (@before:=unix_timestamp())*0;
(@before:=unix_timestamp())*0
0
begin;
select * from t1 for update;
select * from t1 for update;
insert into t2 values (20);
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
select (@after:=unix_timestamp())*0;