diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-27 17:52:37 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-07-27 17:52:37 +0300 |
| commit | 30914389fe9ca13cf29470dd033a5cf6997a3931 (patch) | |
| tree | fac7ab85411e556db4759a9a2c063ef27b851f87 /mysql-test/include/mtr_warnings.sql | |
| parent | 772e3f61eb2956143bbdb1d85490bd5aad73d43c (diff) | |
| parent | 098c0f2634a35e24e9eb0f06d3fba69d0d097657 (diff) | |
| download | mariadb-git-30914389fe9ca13cf29470dd033a5cf6997a3931.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/include/mtr_warnings.sql')
| -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 0584bb934e2..2a9728c0b8a 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 |