diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2017-05-11 08:03:27 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2017-05-11 08:03:27 +0200 |
| commit | b19f055772b0735f7c1757691a42aa3974344b4c (patch) | |
| tree | a7b24ccfd8f7e4b2ef72e2d6d4c8b0094877325b | |
| parent | 105ea511dc9eed25936838408e12147159659087 (diff) | |
| download | mariadb-git-b19f055772b0735f7c1757691a42aa3974344b4c.tar.gz | |
TokuDB .result file update following earlier commit.
| -rw-r--r-- | storage/tokudb/mysql-test/rpl/r/rpl_deadlock_tokudb.result | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/storage/tokudb/mysql-test/rpl/r/rpl_deadlock_tokudb.result b/storage/tokudb/mysql-test/rpl/r/rpl_deadlock_tokudb.result index 2348fd0d9d4..1698dc6df85 100644 --- a/storage/tokudb/mysql-test/rpl/r/rpl_deadlock_tokudb.result +++ b/storage/tokudb/mysql-test/rpl/r/rpl_deadlock_tokudb.result @@ -39,7 +39,9 @@ connection slave; BEGIN; SELECT * FROM t1 FOR UPDATE; a +connection slave1; START SLAVE; +connection slave; SELECT COUNT(*) FROM t2; COUNT(*) 0 @@ -61,8 +63,10 @@ BEGIN; SELECT * FROM t1 FOR UPDATE; a 1 +connection slave1; START SLAVE; include/wait_for_slave_sql_error.inc [errno=1205] +connection slave; SELECT COUNT(*) FROM t2; COUNT(*) 0 @@ -92,8 +96,10 @@ SELECT * FROM t1 FOR UPDATE; a 1 1 +connection slave1; START SLAVE; include/wait_for_slave_sql_error.inc [errno=1205] +connection slave; SELECT COUNT(*) FROM t2; COUNT(*) 0 |