diff options
| author | Tatiana A. Nurnberg <azundris@mysql.com> | 2009-10-20 11:00:07 -0700 |
|---|---|---|
| committer | Tatiana A. Nurnberg <azundris@mysql.com> | 2009-10-20 11:00:07 -0700 |
| commit | 3f0d0d0633b121b2d615fe547bcd41518f49e810 (patch) | |
| tree | b5d1038169ce7dc60fcd39fa7500908a66394ef9 /mysql-test/extra | |
| parent | ead175bb07a9101488fa59794900f65e3186a88d (diff) | |
| parent | 5ef63a4f1c2f1abb81caaec639b962837821000f (diff) | |
| download | mariadb-git-3f0d0d0633b121b2d615fe547bcd41518f49e810.tar.gz | |
manual merge of 28141
Diffstat (limited to 'mysql-test/extra')
| -rw-r--r-- | mysql-test/extra/rpl_tests/rpl_stm_000001.test | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/extra/rpl_tests/rpl_stm_000001.test b/mysql-test/extra/rpl_tests/rpl_stm_000001.test index 1f5eb5786dd..869a9e3b07c 100644 --- a/mysql-test/extra/rpl_tests/rpl_stm_000001.test +++ b/mysql-test/extra/rpl_tests/rpl_stm_000001.test @@ -93,7 +93,7 @@ kill @id; # We don't drop t3 as this is a temporary table drop table t2; connection master; ---error 1053,2013 +--error 1317,2013 reap; connection slave; # The SQL slave thread should now have stopped because the query was killed on |