diff options
| author | Sergey Petrunya <psergey@askmonty.org> | 2012-02-20 20:38:05 +0400 |
|---|---|---|
| committer | Sergey Petrunya <psergey@askmonty.org> | 2012-02-20 20:38:05 +0400 |
| commit | c381e44050303cf12592ae13f401175fa7171a6f (patch) | |
| tree | c7ee2d93183b9062b90e661e4a4f90c09d98501b /mysql-test/r/myisam_icp.result | |
| parent | bd86e37e9dc5fa74bb702b0c379b82c164563fe2 (diff) | |
| download | mariadb-git-c381e44050303cf12592ae13f401175fa7171a6f.tar.gz | |
BUG#933412: Server crashes in _mi_put_key_in_record on KILL QUERY with ICP, STRAIGHT_JOIN
- In mi_rkey(), do correct handling of case where mi_yield_and_check_if_killed()
detects that the thread was killed (all other similar functions in MyISAM/Aria have
slightly different code and do not have this problem).
- Also fixed assignment in DBUG_ASSERT
- this is 2nd variant of the fix:
= make .result file smaller
= run KILLable statements in a separate connection, otherwise we could end up trying to
KILL the final "DROP TABLE" statement
Diffstat (limited to 'mysql-test/r/myisam_icp.result')
| -rw-r--r-- | mysql-test/r/myisam_icp.result | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/mysql-test/r/myisam_icp.result b/mysql-test/r/myisam_icp.result index 3171753adb4..d7442608b59 100644 --- a/mysql-test/r/myisam_icp.result +++ b/mysql-test/r/myisam_icp.result @@ -909,4 +909,19 @@ c NULL NULL c NULL NULL SET optimizer_switch=@save_optimizer_switch; DROP TABLE t1,t2,t3,t4; +# +# BUG#933412: Server crashes in _mi_put_key_in_record on KILL QUERY with ICP, STRAIGHT_JOIN +# +CREATE TABLE t1 ( +b INT, +c VARCHAR(1) NOT NULL, +d DATETIME, +KEY (c, b) +) ENGINE=MyISAM; +# INSERT some data +CREATE TABLE t2 ( a INT ) ENGINE=MyISAM; +INSERT INTO t2 VALUES +(7),(3),(7),(3); +# Now run a number of ICP queries while trying to kill them +DROP TABLE t1,t2; set optimizer_switch=@myisam_icp_tmp; |