summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2022-10-11 16:10:47 +0200
committerSergei Golubchik <serg@mariadb.org>2022-10-11 16:20:22 +0200
commit2aab7f2d0a6555f7ebb6dcde243639354ca5da53 (patch)
treece7b98b5bdb9907d9d384eea1e8a5ce62b36868a /mysql-test
parentd0c4526eced7191b7e8b0b64b789ee70f5f245b6 (diff)
downloadmariadb-git-2aab7f2d0a6555f7ebb6dcde243639354ca5da53.tar.gz
MDEV-26597 post-fix: cannot add new error messages in 10.4
followup for e8acec897417
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/suite/galera/r/MDEV-26597.result2
-rw-r--r--mysql-test/suite/galera/t/MDEV-26597.test2
-rw-r--r--mysql-test/suite/galera/t/galera_repl_max_ws_size.test2
-rw-r--r--mysql-test/suite/galera/t/galera_var_max_ws_size.test2
4 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/suite/galera/r/MDEV-26597.result b/mysql-test/suite/galera/r/MDEV-26597.result
index 76730b56db1..15e334468a5 100644
--- a/mysql-test/suite/galera/r/MDEV-26597.result
+++ b/mysql-test/suite/galera/r/MDEV-26597.result
@@ -11,7 +11,7 @@ CREATE TABLE t1 ( pk int primary key) ENGINE=INNODB;
ERROR HY000: Maximum writeset size exceeded
SHOW WARNINGS;
Level Code Message
-Error 4160 Maximum writeset size exceeded
+Error 1105 Maximum writeset size exceeded
connection node_2;
SET SESSION wsrep_sync_wait = 0;
Killing server ...
diff --git a/mysql-test/suite/galera/t/MDEV-26597.test b/mysql-test/suite/galera/t/MDEV-26597.test
index 3162cefcc22..783a52cad50 100644
--- a/mysql-test/suite/galera/t/MDEV-26597.test
+++ b/mysql-test/suite/galera/t/MDEV-26597.test
@@ -10,7 +10,7 @@ CREATE TABLE t3 (c1 INTEGER NOT NULL PRIMARY KEY, c2 FLOAT(3,2));
SET GLOBAL wsrep_provider_options = 'repl.max_ws_size=512';
SET @@autocommit=0;
INSERT INTO t3 VALUES (1000,0.00),(1001,0.25),(1002,0.50),(1003,0.75),(1008,1.00),(1009,1.25),(1010,1.50),(1011,1.75);
---error ER_TOO_BIG_WRITESET
+--error ER_UNKNOWN_ERROR
CREATE TABLE t1 ( pk int primary key) ENGINE=INNODB;
SHOW WARNINGS;
diff --git a/mysql-test/suite/galera/t/galera_repl_max_ws_size.test b/mysql-test/suite/galera/t/galera_repl_max_ws_size.test
index 896ad99f3d8..2e29a030664 100644
--- a/mysql-test/suite/galera/t/galera_repl_max_ws_size.test
+++ b/mysql-test/suite/galera/t/galera_repl_max_ws_size.test
@@ -12,7 +12,7 @@ CREATE TABLE t1 (f1 VARCHAR(512)) ENGINE=InnoDB;
SET GLOBAL wsrep_provider_options = 'repl.max_ws_size=512';
---error ER_TOO_BIG_WRITESET
+--error ER_UNKNOWN_ERROR
INSERT INTO t1 VALUES (REPEAT('a', 512));
SELECT COUNT(*) = 0 FROM t1;
diff --git a/mysql-test/suite/galera/t/galera_var_max_ws_size.test b/mysql-test/suite/galera/t/galera_var_max_ws_size.test
index 440b3dea2a3..9444b8f2c4d 100644
--- a/mysql-test/suite/galera/t/galera_var_max_ws_size.test
+++ b/mysql-test/suite/galera/t/galera_var_max_ws_size.test
@@ -12,7 +12,7 @@ CREATE TABLE t1 (f1 INTEGER AUTO_INCREMENT PRIMARY KEY, f2 VARCHAR(1024)) Engine
--let $wsrep_max_ws_size_orig = `SELECT @@wsrep_max_ws_size`
SET GLOBAL wsrep_max_ws_size = 1024;
---error ER_TOO_BIG_WRITESET
+--error ER_UNKNOWN_ERROR
INSERT INTO t1 VALUES (DEFAULT, REPEAT('X', 1024));
SELECT COUNT(*) = 0 FROM t1;