1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

MDEV-22189: Change error messages inside code to have mariadb instead of

mysql

Fix: Changed error messages, rerecorded results and changed other relevant
files.
This commit is contained in:
Rucha Deodhar
2021-03-18 13:17:30 +05:30
parent 16502e8cf3
commit 4e19539c14
69 changed files with 211 additions and 120 deletions

View File

@@ -1,6 +1,6 @@
--- r/mysql-wsrep#33.result 2021-04-10 14:36:42.663191908 +0300
+++ r/mysql-wsrep#33,debug.reject 2021-04-10 15:43:02.420168969 +0300
@@ -698,6 +698,190 @@
--- r/mysql-wsrep#33.result
+++ r/mysql-wsrep#33,debug.reject
@@ -698,12 +698,196 @@
1
DROP TABLE t1;
COMMIT;
@@ -190,4 +190,12 @@
+SET GLOBAL debug_dbug = $debug_orig;
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 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");