summaryrefslogtreecommitdiff
path: root/mysql-test/include
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-08-25 15:31:19 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-08-25 15:31:19 +0300
commit9929301ecd0d3e4571e03ab4cabdea00179e4c8a (patch)
tree27a31e9e8bbf1e2fa6a82b3fd54cdacabf3c93c9 /mysql-test/include
parenta3fd9e6b064e28256f932595fb5f2ac3c33072fc (diff)
parent851058a3e6f40cd2714762916235ebe93fc594b5 (diff)
downloadmariadb-git-9929301ecd0d3e4571e03ab4cabdea00179e4c8a.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'mysql-test/include')
-rw-r--r--mysql-test/include/mtr_warnings.sql2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql
index fa1ea95e5e1..9ce81703450 100644
--- a/mysql-test/include/mtr_warnings.sql
+++ b/mysql-test/include/mtr_warnings.sql
@@ -174,7 +174,7 @@ INSERT INTO global_suppressions VALUES
/* Added 2009-08-XX after fixing Bug #42408 */
- ("Although a path was specified for the .* option, log tables are used"),
+ ("Although a .* file was specified, log tables are used. To enable logging to files "),
("Backup: Operation aborted"),
("Restore: Operation aborted"),
("Restore: The grant .* was skipped because the user does not exist"),