diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-30 09:04:43 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-30 09:04:43 +0300 |
| commit | 064cb58efea063595e336e4cd0feccb12d26f8cf (patch) | |
| tree | f140b96c8a20172cbb484375e38a7aa481ab660b /mysql-test/main/sp-lock.test | |
| parent | e5a9dcfda20e174525ad63a30e12f592aa9c96d3 (diff) | |
| parent | 57fdd016ce6167c15ba9cd41048b8a42ba582447 (diff) | |
| download | mariadb-git-064cb58efea063595e336e4cd0feccb12d26f8cf.tar.gz | |
Merge 10.4 into 10.5
FIXME: Part of the MDEV-20699 test is disabled due to
nonderterministic result.
Diffstat (limited to 'mysql-test/main/sp-lock.test')
| -rw-r--r-- | mysql-test/main/sp-lock.test | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mysql-test/main/sp-lock.test b/mysql-test/main/sp-lock.test index 83ea07d4bda..703c59e8f28 100644 --- a/mysql-test/main/sp-lock.test +++ b/mysql-test/main/sp-lock.test @@ -807,9 +807,6 @@ connection default; --echo # --echo # SHOW CREATE PROCEDURE p1 called from p1, after p1 was altered --echo # ---echo # We are just covering the existing behaviour with tests. The ---echo # results are not necessarily correct." ---echo # delimiter |; CREATE PROCEDURE p1() |