diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-27 14:25:36 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-27 14:25:36 +0300 |
| commit | e5c4f4e590d7782ef938b436f84ae11b68e0af08 (patch) | |
| tree | 7919303321a6e4663340a75dd56aa4ef55e3ef4f /mysql-test/include | |
| parent | 3bb36e949534fc4a24d68d4297663ae8b80ba336 (diff) | |
| parent | 0ee1082bd2e7e7049c4f0e686bad53cf7ba053ab (diff) | |
| download | mariadb-git-e5c4f4e590d7782ef938b436f84ae11b68e0af08.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/mtr_warnings.sql | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql index 577d2a78b47..fa1ea95e5e1 100644 --- a/mysql-test/include/mtr_warnings.sql +++ b/mysql-test/include/mtr_warnings.sql @@ -157,6 +157,10 @@ INSERT INTO global_suppressions VALUES ("InnoDB: Error: table `test`.`t[123]` .*does not exist in the InnoDB internal"), ("InnoDB: Warning: semaphore wait:"), + /* MDEV-28976: Tests that kill the server do not ensure that the + old process has terminated before starting a new one */ + ("InnoDB: Unable to lock"), + /* BUG#32080 - Excessive warnings on Solaris: setrlimit could not change the size of core files |