From 3f619478f796eddbba6e39502fe941b285dd97b1 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 4 May 2024 20:00:34 +0200 Subject: Adding upstream version 1:10.11.6. Signed-off-by: Daniel Baumann --- mysql-test/suite/galera/r/mysql-wsrep#33,release.rdiff | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 mysql-test/suite/galera/r/mysql-wsrep#33,release.rdiff (limited to 'mysql-test/suite/galera/r/mysql-wsrep#33,release.rdiff') diff --git a/mysql-test/suite/galera/r/mysql-wsrep#33,release.rdiff b/mysql-test/suite/galera/r/mysql-wsrep#33,release.rdiff new file mode 100644 index 00000000..afbfc023 --- /dev/null +++ b/mysql-test/suite/galera/r/mysql-wsrep#33,release.rdiff @@ -0,0 +1,15 @@ +--- r/mysql-wsrep#33.result ++++ r/mysql-wsrep#33.reject +@@ -700,10 +700,10 @@ + COMMIT; + connection node_2; + connection node_1; +-CALL mtr.add_suppression("Slave SQL: Error 'The MySQL server is running with the --skip-grant-tables option so it cannot execute this statement' on query"); ++CALL mtr.add_suppression("Slave SQL: Error 'The MariaDB server is running with the --skip-grant-tables option so it cannot execute this statement' on query"); + DROP USER sst; + connection node_2; +-CALL mtr.add_suppression("Slave SQL: Error 'The MySQL server is running with the --skip-grant-tables option so it cannot execute this statement' on query"); ++CALL mtr.add_suppression("Slave SQL: Error 'The MariaDB server is running with the --skip-grant-tables option so it cannot execute this statement' on query"); + CALL mtr.add_suppression("InnoDB: Error: Table \"mysql\"\\.\"innodb_index_stats\" not found"); + CALL mtr.add_suppression("Can't open and lock time zone table"); + CALL mtr.add_suppression("Can't open and lock privilege tables"); -- cgit v1.2.3