diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-07-05 16:44:12 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-07-05 16:47:54 +0300 |
| commit | 1b335a74b4ea1944d6ef91113b1a510c0f11c557 (patch) | |
| tree | f7af758e3019c4e8bacfdc3f89a2c32ce8a35c85 | |
| parent | d897b4dc253d00f14c9b0b3bb94a99aadb358f6c (diff) | |
| download | mariadb-git-1b335a74b4ea1944d6ef91113b1a510c0f11c557.tar.gz | |
Clean up a test
At the end of a test, 'connection default' should be in a usable state.
This was not the case, because there was a preceding 'send' without a
'reap'. If 'reap' was added, an error would be reported because the
server was restarted after the 'send'. It is easiest to 'send' from a
separate connection and do the restart from 'connection default'.
| -rw-r--r-- | mysql-test/r/cte_recursive.result | 6 | ||||
| -rw-r--r-- | mysql-test/t/cte_recursive.test | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/mysql-test/r/cte_recursive.result b/mysql-test/r/cte_recursive.result index 856f00abe59..d715fa20a6f 100644 --- a/mysql-test/r/cte_recursive.result +++ b/mysql-test/r/cte_recursive.result @@ -3314,10 +3314,10 @@ WITH recursive cte AS (SELECT 1 a UNION SELECT cte.* FROM cte natural join t1) SELECT * FROM cte limit 1 ); -SELECT func();; connect con1,localhost,root,,; -KILL QUERY 4; +SELECT func(); +connection default; +KILL QUERY 5; DROP FUNCTION func; DROP TABLE t1; disconnect con1; -connection default; diff --git a/mysql-test/t/cte_recursive.test b/mysql-test/t/cte_recursive.test index 504b2c64442..227ccd0cdb3 100644 --- a/mysql-test/t/cte_recursive.test +++ b/mysql-test/t/cte_recursive.test @@ -1,3 +1,4 @@ +--source include/not_embedded.inc create table t1 (a int, b varchar(32)); insert into t1 values (4,'aaaa' ), (7,'bb'), (1,'ccc'), (4,'dd'); @@ -2342,15 +2343,14 @@ RETURN SELECT * FROM cte limit 1 ); +--connect (con1,localhost,root,,) --let $conid= `SELECT CONNECTION_ID()` ---send SELECT func(); +--send SELECT func() ---connect (con1,localhost,root,,) +--connection default --eval KILL QUERY $conid --source include/restart_mysqld.inc DROP FUNCTION func; DROP TABLE t1; --disconnect con1 - ---connection default |