diff options
Diffstat (limited to 'mysql-test/r/mix_innodb_myisam_binlog.result')
| -rw-r--r-- | mysql-test/r/mix_innodb_myisam_binlog.result | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/r/mix_innodb_myisam_binlog.result b/mysql-test/r/mix_innodb_myisam_binlog.result index a2717c68a4f..72288d1027b 100644 --- a/mysql-test/r/mix_innodb_myisam_binlog.result +++ b/mysql-test/r/mix_innodb_myisam_binlog.result @@ -194,7 +194,7 @@ select (@before:=unix_timestamp())*0; begin; select * from t1 for update; insert into t2 values (20); -Lock wait timeout exceeded; Try restarting transaction +ERROR HY000: Lock wait timeout exceeded; try restarting transaction select (@after:=unix_timestamp())*0; (@after:=unix_timestamp())*0 0 |