Merge 10.0 into 10.1

2025-08-08 11:22:35 +03:00 · 2017-02-08 08:53:34 +02:00
parent 6da2adfaa2 f162704570
commit 2e67e66c3a
29 changed files with 624 additions and 549 deletions
--- 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
 */||