diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-26 11:54:55 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-26 11:54:55 +0300 |
| commit | ca38b6e42791a6edbd3cc0b626a8d06b7776e76b (patch) | |
| tree | f0b9f34521554ce94ef9a5bd6c7e5f595459240f /mysql-test/main/lock.test | |
| parent | ea7830eef48333e28f98a9b91f05a95735b465a3 (diff) | |
| parent | 7476e8c7cdd73d60294126a2840baee97e7644b6 (diff) | |
| download | mariadb-git-ca38b6e42791a6edbd3cc0b626a8d06b7776e76b.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/main/lock.test')
| -rw-r--r-- | mysql-test/main/lock.test | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/mysql-test/main/lock.test b/mysql-test/main/lock.test index 8a59f4082b1..32e4fd47664 100644 --- a/mysql-test/main/lock.test +++ b/mysql-test/main/lock.test @@ -619,3 +619,17 @@ UNLOCK TABLES; UNLOCK TABLES; DROP TABLE t1, t2; +--echo # +--echo # MDEV-21398 Deadlock (server hang) or assertion failure in +--echo # Diagnostics_area::set_error_status upon ALTER under lock +--echo # + +CREATE TABLE t1 (a INT) ENGINE=MyISAM; +LOCK TABLE t1 WRITE, t1 AS t1a READ; +ALTER TABLE t1 CHANGE COLUMN IF EXISTS x xx INT; +UNLOCK TABLES; +DROP TABLE t1; + +--echo # +--echo # End of 10.2 tests +--echo # |