diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-02-08 08:53:34 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-02-08 08:53:34 +0200 |
| commit | 2e67e66c3a5107c0df21b56f387a896cdd2ec4e4 (patch) | |
| tree | 819bcd107a71c09e12ddd082e13b271b4a878173 /mysql-test/include | |
| parent | 6da2adfaa203fd9f76a32fa314b3c14f11ecddc1 (diff) | |
| parent | f1627045701b0dc0ff10ec09cca18dc5da351768 (diff) | |
| download | mariadb-git-2e67e66c3a5107c0df21b56f387a896cdd2ec4e4.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'mysql-test/include')
| -rw-r--r-- | mysql-test/include/mtr_warnings.sql | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql index 278add92ba5..535090b75dd 100644 --- a/mysql-test/include/mtr_warnings.sql +++ b/mysql-test/include/mtr_warnings.sql @@ -292,6 +292,7 @@ CREATE DEFINER=root@localhost PROCEDURE add_suppression(pattern VARCHAR(255)) BEGIN INSERT INTO test_suppressions (pattern) VALUES (pattern); + FLUSH NO_WRITE_TO_BINLOG TABLE test_suppressions; END */|| |