Remove end . from error messages to get them consistent

Fixed a few failing tests

mysql-test/r/alter_table.result

@@ -1544,17 +1544,17 @@ ALTER TABLE t1 ADD INDEX i2(b), ALGORITHM= DEFAULT;
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 1
 Warnings:
-Note	1831	Duplicate index 'i2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'i2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 ALTER TABLE t1 ADD INDEX i3(b), ALGORITHM= COPY;
 affected rows: 2
 info: Records: 2  Duplicates: 0  Warnings: 1
 Warnings:
-Note	1831	Duplicate index 'i3' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'i3' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 ALTER TABLE t1 ADD INDEX i4(b), ALGORITHM= INPLACE;
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 1
 Warnings:
-Note	1831	Duplicate index 'i4' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'i4' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 ALTER TABLE t1 ADD INDEX i5(b), ALGORITHM= INVALID;
 ERROR HY000: Unknown ALGORITHM 'INVALID'
 ALTER TABLE m1 ENABLE KEYS;
@@ -1579,17 +1579,17 @@ ALTER TABLE t1 ADD INDEX i2(b), ALGORITHM= DEFAULT;
 affected rows: 2
 info: Records: 2  Duplicates: 0  Warnings: 1
 Warnings:
-Note	1831	Duplicate index 'i2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'i2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 ALTER TABLE t1 ADD INDEX i3(b), ALGORITHM= COPY;
 affected rows: 2
 info: Records: 2  Duplicates: 0  Warnings: 1
 Warnings:
-Note	1831	Duplicate index 'i3' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'i3' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 ALTER TABLE t1 ADD INDEX i4(b), ALGORITHM= INPLACE;
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 1
 Warnings:
-Note	1831	Duplicate index 'i4' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'i4' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 SET SESSION old_alter_table= 0;
 affected rows: 0
 ALTER TABLE t1 DROP INDEX i1, DROP INDEX i2, DROP INDEX i3, DROP INDEX i4;
@@ -1611,24 +1611,24 @@ ALTER TABLE t1 ADD INDEX i2(b), LOCK= NONE;
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 1
 Warnings:
-Note	1831	Duplicate index 'i2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'i2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 ALTER TABLE t1 ADD INDEX i3(b), LOCK= SHARED;
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 1
 Warnings:
-Note	1831	Duplicate index 'i3' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'i3' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 ALTER TABLE t1 ADD INDEX i4(b), LOCK= EXCLUSIVE;
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 1
 Warnings:
-Note	1831	Duplicate index 'i4' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'i4' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 ALTER TABLE t1 ADD INDEX i5(b), LOCK= INVALID;
 ERROR HY000: Unknown LOCK type 'INVALID'
 ALTER TABLE m1 ENABLE KEYS, LOCK= DEFAULT;
 ALTER TABLE m1 ENABLE KEYS, LOCK= NONE;
-ERROR 0A000: LOCK=NONE/SHARED is not supported for this operation. Try LOCK=EXCLUSIVE.
+ERROR 0A000: LOCK=NONE/SHARED is not supported for this operation. Try LOCK=EXCLUSIVE
 ALTER TABLE m1 ENABLE KEYS, LOCK= SHARED;
-ERROR 0A000: LOCK=NONE/SHARED is not supported for this operation. Try LOCK=EXCLUSIVE.
+ERROR 0A000: LOCK=NONE/SHARED is not supported for this operation. Try LOCK=EXCLUSIVE
 ALTER TABLE m1 ENABLE KEYS, LOCK= EXCLUSIVE;
 ALTER TABLE t1 DROP INDEX i1, DROP INDEX i2, DROP INDEX i3, DROP INDEX i4;
 #
@@ -1641,34 +1641,34 @@ ALTER TABLE t1 ADD INDEX i2(b), ALGORITHM= INPLACE, LOCK= SHARED;
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 1
 Warnings:
-Note	1831	Duplicate index 'i2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'i2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 ALTER TABLE t1 ADD INDEX i3(b), ALGORITHM= INPLACE, LOCK= EXCLUSIVE;
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 1
 Warnings:
-Note	1831	Duplicate index 'i3' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'i3' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 ALTER TABLE t1 ADD INDEX i4(b), ALGORITHM= COPY, LOCK= NONE;
-ERROR 0A000: LOCK=NONE is not supported. Reason: COPY algorithm requires a lock. Try LOCK=SHARED.
+ERROR 0A000: LOCK=NONE is not supported. Reason: COPY algorithm requires a lock. Try LOCK=SHARED
 ALTER TABLE t1 ADD INDEX i5(b), ALGORITHM= COPY, LOCK= SHARED;
 affected rows: 2
 info: Records: 2  Duplicates: 0  Warnings: 1
 Warnings:
-Note	1831	Duplicate index 'i5' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'i5' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 ALTER TABLE t1 ADD INDEX i6(b), ALGORITHM= COPY, LOCK= EXCLUSIVE;
 affected rows: 2
 info: Records: 2  Duplicates: 0  Warnings: 1
 Warnings:
-Note	1831	Duplicate index 'i6' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'i6' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 ALTER TABLE m1 ENABLE KEYS, ALGORITHM= INPLACE, LOCK= NONE;
-ERROR 0A000: LOCK=NONE/SHARED is not supported for this operation. Try LOCK=EXCLUSIVE.
+ERROR 0A000: LOCK=NONE/SHARED is not supported for this operation. Try LOCK=EXCLUSIVE
 ALTER TABLE m1 ENABLE KEYS, ALGORITHM= INPLACE, LOCK= SHARED;
-ERROR 0A000: LOCK=NONE/SHARED is not supported for this operation. Try LOCK=EXCLUSIVE.
+ERROR 0A000: LOCK=NONE/SHARED is not supported for this operation. Try LOCK=EXCLUSIVE
 ALTER TABLE m1 ENABLE KEYS, ALGORITHM= INPLACE, LOCK= EXCLUSIVE;
 affected rows: 0
 ALTER TABLE m1 ENABLE KEYS, ALGORITHM= COPY, LOCK= NONE;
-ERROR 0A000: LOCK=NONE is not supported. Reason: COPY algorithm requires a lock. Try LOCK=SHARED.
+ERROR 0A000: LOCK=NONE is not supported. Reason: COPY algorithm requires a lock. Try LOCK=SHARED
 ALTER ONLINE TABLE m1 ADD COLUMN c int;
-ERROR 0A000: LOCK=NONE is not supported for this operation. Try LOCK=SHARED.
+ERROR 0A000: LOCK=NONE is not supported for this operation. Try LOCK=SHARED
 ALTER TABLE m1 ENABLE KEYS, ALGORITHM= COPY, LOCK= SHARED;
 affected rows: 2
 info: Records: 2  Duplicates: 0  Warnings: 0
@@ -1771,7 +1771,7 @@ ALTER TABLE tm1 ADD FULLTEXT INDEX im4 (d2);
 affected rows: 2
 info: Records: 2  Duplicates: 0  Warnings: 0
 ALTER TABLE ti1 ADD PRIMARY KEY(a), ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: InnoDB presently supports one FULLTEXT index creation at a time. Try ALGORITHM=COPY.
+ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: InnoDB presently supports one FULLTEXT index creation at a time. Try ALGORITHM=COPY
 ALTER TABLE ti1 ADD PRIMARY KEY(a);
 affected rows: 2
 info: Records: 2  Duplicates: 0  Warnings: 0

mysql-test/r/alter_table_online.result

@@ -20,21 +20,21 @@ drop table t2;
 create table t1 (a int not null primary key, b int, c varchar(80), e enum('a','b'));
 insert into t1 (a) values (1),(2),(3);
 alter online table t1 drop column b, add b int;
-ERROR 0A000: LOCK=NONE is not supported for this operation. Try LOCK=SHARED.
+ERROR 0A000: LOCK=NONE is not supported for this operation. Try LOCK=SHARED
 alter online table t1 modify b bigint;
-ERROR 0A000: LOCK=NONE is not supported for this operation. Try LOCK=SHARED.
+ERROR 0A000: LOCK=NONE is not supported for this operation. Try LOCK=SHARED
 alter online table t1 modify e enum('c','a','b');
-ERROR 0A000: LOCK=NONE is not supported for this operation. Try LOCK=SHARED.
+ERROR 0A000: LOCK=NONE is not supported for this operation. Try LOCK=SHARED
 alter online table t1 modify c varchar(50);
-ERROR 0A000: LOCK=NONE is not supported for this operation. Try LOCK=SHARED.
+ERROR 0A000: LOCK=NONE is not supported for this operation. Try LOCK=SHARED
 alter online table t1 modify c varchar(100);
-ERROR 0A000: LOCK=NONE is not supported for this operation. Try LOCK=SHARED.
+ERROR 0A000: LOCK=NONE is not supported for this operation. Try LOCK=SHARED
 alter online table t1 add f int;
-ERROR 0A000: LOCK=NONE is not supported for this operation. Try LOCK=SHARED.
+ERROR 0A000: LOCK=NONE is not supported for this operation. Try LOCK=SHARED
 alter online table t1 engine=memory;
-ERROR 0A000: LOCK=NONE is not supported. Reason: COPY algorithm requires a lock. Try LOCK=SHARED.
+ERROR 0A000: LOCK=NONE is not supported. Reason: COPY algorithm requires a lock. Try LOCK=SHARED
 alter online table t1 rename to t2;
-ERROR 0A000: LOCK=NONE/SHARED is not supported for this operation. Try LOCK=EXCLUSIVE.
+ERROR 0A000: LOCK=NONE/SHARED is not supported for this operation. Try LOCK=EXCLUSIVE
 alter table t1 engine=innodb;
 alter table t1 add index (b);
 alter online table t1 add index c (c);
@@ -59,7 +59,7 @@ create table t1 (a int not null primary key, b int, c varchar(80));
 create table t2 (a int not null primary key, b int, c varchar(80));
 create table t3 (a int not null primary key, b int, c varchar(80)) engine=merge UNION=(t1);
 alter online table t3 union=(t1,t2);
-ERROR 0A000: LOCK=NONE/SHARED is not supported for this operation. Try LOCK=EXCLUSIVE.
+ERROR 0A000: LOCK=NONE/SHARED is not supported for this operation. Try LOCK=EXCLUSIVE
 drop table t1,t2,t3;
 create table t1 (i int) partition by hash(i) partitions 2;
 alter online table t1 comment 'test';
@@ -114,75 +114,75 @@ ALTER TABLE t1 MODIFY a LONGTEXT, ALGORITHM=INPLACE;
 DROP TABLE t1;
 CREATE TABLE t1 (a CHAR(10));
 ALTER TABLE t1 MODIFY a CHAR(10) COLLATE latin1_bin, ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
 DROP TABLE t1;
 CREATE TABLE t1 (a VARCHAR(10));
 ALTER TABLE t1 MODIFY a VARCHAR(10) COLLATE latin1_bin, ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
 DROP TABLE t1;
 CREATE TABLE t1 (a TINYTEXT);
 ALTER TABLE t1 MODIFY a TINYTEXT COLLATE latin1_bin, ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
 DROP TABLE t1;
 CREATE TABLE t1 (a MEDIUMTEXT);
 ALTER TABLE t1 MODIFY a MEDIUMTEXT COLLATE latin1_bin, ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
 DROP TABLE t1;
 CREATE TABLE t1 (a TEXT);
 ALTER TABLE t1 MODIFY a TEXT COLLATE latin1_bin, ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
 DROP TABLE t1;
 CREATE TABLE t1 (a LONGTEXT);
 ALTER TABLE t1 MODIFY a LONGTEXT COLLATE latin1_bin, ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
 DROP TABLE t1;
 CREATE TABLE t1 (a CHAR(10) COLLATE latin1_bin);
 ALTER TABLE t1 MODIFY a CHAR(10) COLLATE latin1_swedish_ci, ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
 DROP TABLE t1;
 CREATE TABLE t1 (a VARCHAR(10) COLLATE latin1_bin);
 ALTER TABLE t1 MODIFY a VARCHAR(10) COLLATE latin1_swedish_ci, ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
 DROP TABLE t1;
 CREATE TABLE t1 (a TINYTEXT COLLATE latin1_bin);
 ALTER TABLE t1 MODIFY a TINYTEXT COLLATE latin1_swedish_ci, ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
 DROP TABLE t1;
 CREATE TABLE t1 (a MEDIUMTEXT COLLATE latin1_bin);
 ALTER TABLE t1 MODIFY a MEDIUMTEXT COLLATE latin1_swedish_ci, ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
 DROP TABLE t1;
 CREATE TABLE t1 (a TEXT COLLATE latin1_bin);
 ALTER TABLE t1 MODIFY a TEXT COLLATE latin1_swedish_ci, ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
 DROP TABLE t1;
 CREATE TABLE t1 (a LONGTEXT COLLATE latin1_bin);
 ALTER TABLE t1 MODIFY a LONGTEXT COLLATE latin1_swedish_ci, ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
 DROP TABLE t1;
 CREATE TABLE t1 (a CHAR(10) COLLATE latin1_general_ci);
 ALTER TABLE t1 MODIFY a CHAR(10) COLLATE latin1_swedish_ci, ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
 DROP TABLE t1;
 CREATE TABLE t1 (a VARCHAR(10) COLLATE latin1_general_ci);
 ALTER TABLE t1 MODIFY a VARCHAR(10) COLLATE latin1_swedish_ci, ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
 DROP TABLE t1;
 CREATE TABLE t1 (a TINYTEXT COLLATE latin1_general_ci);
 ALTER TABLE t1 MODIFY a TINYTEXT COLLATE latin1_swedish_ci, ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
 DROP TABLE t1;
 CREATE TABLE t1 (a MEDIUMTEXT COLLATE latin1_general_ci);
 ALTER TABLE t1 MODIFY a MEDIUMTEXT COLLATE latin1_swedish_ci, ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
 DROP TABLE t1;
 CREATE TABLE t1 (a TEXT COLLATE latin1_general_ci);
 ALTER TABLE t1 MODIFY a TEXT COLLATE latin1_swedish_ci, ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
 DROP TABLE t1;
 CREATE TABLE t1 (a LONGTEXT COLLATE latin1_general_ci);
 ALTER TABLE t1 MODIFY a LONGTEXT COLLATE latin1_swedish_ci, ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
 DROP TABLE t1;
 #
 # End of MDEV-8948 ALTER ... INPLACE does work for BINARY, BLOB

mysql-test/r/bigint.result

@@ -362,12 +362,12 @@ select cast(19999999999999999999 as signed);
 cast(19999999999999999999 as signed)
 9223372036854775807
 Warnings:
-Warning	1916	Got overflow when converting '19999999999999999999' to INT. Value truncated.
+Warning	1916	Got overflow when converting '19999999999999999999' to INT. Value truncated
 select cast(-19999999999999999999 as signed);
 cast(-19999999999999999999 as signed)
 -9223372036854775808
 Warnings:
-Warning	1916	Got overflow when converting '-19999999999999999999' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-19999999999999999999' to INT. Value truncated
 select -9223372036854775808;
 Catalog	Database	Table	Table_alias	Column	Column_alias	Type	Length	Max length	Is_null	Flags	Decimals	Charsetnr
 def					-9223372036854775808	8	20	20	N	32897	0	63

mysql-test/r/check.result

@@ -5,9 +5,9 @@ drop table if exists t1,t2;
 drop view if exists v1;
 create table t1(n int not null, key(n), key(n), key(n), key(n));
 Warnings:
-Note	1831	Duplicate index 'n_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'n_3' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'n_4' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'n_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'n_3' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'n_4' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 check table t1 extended;
 connection con2;
 insert into t1 values (200000);

mysql-test/r/commit.result

@@ -339,54 +339,54 @@ CREATE TEMPORARY TABLE temp_t2(a INT);
 SET SESSION TRANSACTION READ ONLY;
 # 1: DDL should be blocked, also on temporary tables.
 CREATE TABLE t3(a INT);
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 ALTER TABLE t1 COMMENT "Test";
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 DROP TABLE t1;
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 CREATE TEMPORARY TABLE temp_t3(a INT);
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 ALTER TABLE temp_t2 COMMENT "Test";
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 DROP TEMPORARY TABLE temp_t2;
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 CREATE FUNCTION f1() RETURNS INT RETURN 1;
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 DROP FUNCTION f1;
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 CREATE PROCEDURE p1() BEGIN END;
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 DROP PROCEDURE p1;
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 CREATE VIEW v1 AS SELECT 1;
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 SET SESSION TRANSACTION READ WRITE;
 CREATE VIEW v1 AS SELECT 1;
 SET SESSION TRANSACTION READ ONLY;
 DROP VIEW v1;
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 SET SESSION TRANSACTION READ WRITE;
 DROP VIEW v1;
 SET SESSION TRANSACTION READ ONLY;
 RENAME TABLE t1 TO t2;
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 RENAME TABLE temp_t2 TO temp_t3;
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 TRUNCATE TABLE t1;
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 CREATE DATABASE db1;
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 DROP DATABASE db1;
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 SET SESSION TRANSACTION READ WRITE;
 # 2: DML should be blocked on non-temporary tables.
 START TRANSACTION READ ONLY;
 INSERT INTO t1 VALUES (1), (2);
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 UPDATE t1 SET a= 3;
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 DELETE FROM t1;
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 # 3: DML should be allowed on temporary tables.
 INSERT INTO temp_t2 VALUES (1), (2);
 UPDATE temp_t2 SET a= 3;
@@ -406,7 +406,7 @@ a
 HANDLER temp_t2 CLOSE;
 # 5: Prepared statements
 PREPARE stmt FROM "DELETE FROM t1";
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 PREPARE stmt FROM "DELETE FROM temp_t2";
 EXECUTE stmt;
 DEALLOCATE PREPARE stmt;
@@ -426,12 +426,12 @@ CREATE PROCEDURE p1() DELETE FROM t1;
 CREATE PROCEDURE p2() DELETE FROM temp_t2;
 START TRANSACTION READ ONLY;
 SELECT f1();
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 SELECT f2();
 f2()
 1
 CALL p1();
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 CALL p2();
 COMMIT;
 DROP FUNCTION f1;
@@ -442,7 +442,7 @@ DROP PROCEDURE p2;
 CREATE VIEW v1 AS SELECT a FROM t1;
 START TRANSACTION READ ONLY;
 INSERT INTO v1 VALUES (1), (2);
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 SELECT * FROM v1;
 a
 COMMIT;
@@ -450,7 +450,7 @@ DROP VIEW v1;
 # 8: LOCK TABLE
 SET SESSION TRANSACTION READ ONLY;
 LOCK TABLE t1 WRITE;
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 LOCK TABLE t1 READ;
 UNLOCK TABLES;
 SET SESSION TRANSACTION READ WRITE;
@@ -461,7 +461,7 @@ CREATE TABLE t1(a INT);
 SET SESSION TRANSACTION READ ONLY;
 START TRANSACTION;
 DELETE FROM t1;
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 COMMIT;
 START TRANSACTION READ WRITE;
 DELETE FROM t1;
@@ -470,7 +470,7 @@ SET SESSION TRANSACTION READ WRITE;
 SET TRANSACTION READ ONLY;
 START TRANSACTION;
 DELETE FROM t1;
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 COMMIT;
 START TRANSACTION READ WRITE;
 DELETE FROM t1;
@@ -480,14 +480,14 @@ SELECT * FROM t1;
 a
 COMMIT AND CHAIN;
 DELETE FROM t1;
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 COMMIT;
 START TRANSACTION READ ONLY;
 SELECT * FROM t1;
 a
 ROLLBACK AND CHAIN;
 DELETE FROM t1;
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 COMMIT;
 DROP TABLE t1;
 #
@@ -512,11 +512,11 @@ CREATE TABLE t1(a INT);
 SET TRANSACTION READ ONLY;
 XA START 'test1';
 INSERT INTO t1 VALUES (1);
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 UPDATE t1 SET a=2;
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 DELETE FROM t1;
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 XA END 'test1';
 XA PREPARE 'test1';
 XA COMMIT 'test1';

mysql-test/r/constraints.result

@@ -45,10 +45,10 @@ create table t1 (a int null);
 alter table t1 add constraint constraint_1 unique (a);
 alter table t1 add constraint unique key_1(a);
 Warnings:
-Note	1831	Duplicate index 'key_1' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'key_1' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 alter table t1 add constraint constraint_2 unique key_2(a);
 Warnings:
-Note	1831	Duplicate index 'key_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'key_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (

mysql-test/r/create.result

@@ -181,36 +181,36 @@ Warnings:
 Note	1051	Unknown table 'test.t2'
 create table t1 (a int not null, b int, primary key(a), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b), key (b));
 Warnings:
-Note	1831	Duplicate index 'b_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'b_3' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'b_4' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'b_5' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'b_6' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'b_7' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'b_8' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'b_9' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'b_10' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'b_11' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'b_12' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'b_13' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'b_14' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'b_15' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'b_16' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'b_17' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'b_18' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'b_19' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'b_20' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'b_21' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'b_22' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'b_23' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'b_24' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'b_25' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'b_26' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'b_27' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'b_28' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'b_29' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'b_30' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'b_31' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'b_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'b_3' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'b_4' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'b_5' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'b_6' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'b_7' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'b_8' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'b_9' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'b_10' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'b_11' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'b_12' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'b_13' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'b_14' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'b_15' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'b_16' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'b_17' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'b_18' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'b_19' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'b_20' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'b_21' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'b_22' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'b_23' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'b_24' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'b_25' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'b_26' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'b_27' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'b_28' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'b_29' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'b_30' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'b_31' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -1342,7 +1342,7 @@ BEGIN
 INSERT INTO t1 ( `int` ) VALUES (4 ),( 8 ),( 2 ) ; 
 END ; |
 INSERT INTO t1 (pk, int_key) SELECT `pk` , `int_key` FROM B ;
-ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
+ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger
 CREATE TRIGGER f BEFORE INSERT ON t1 FOR EACH ROW 
 BEGIN 
 UPDATE A SET `pk`=1 WHERE `pk`=0 ; 

mysql-test/r/create_drop_binlog.result

@@ -141,7 +141,7 @@ DROP SERVER s1;
 CREATE SERVER IF NOT EXISTS s1 FOREIGN DATA WRAPPER mysql OPTIONS (USER 'root', HOST 'localhost', DATABASE 'test');
 CREATE SERVER IF NOT EXISTS s1 FOREIGN DATA WRAPPER mysql OPTIONS (USER 'root', HOST 'localhost', DATABASE 'test');
 Warnings:
-Note	1476	The foreign server, s1, you are trying to create already exists.
+Note	1476	The foreign server, s1, you are trying to create already exists
 DROP SERVER IF EXISTS s1;
 DROP SERVER IF EXISTS s1;
 SHOW BINLOG EVENTS;

mysql-test/r/create_drop_server.result

@@ -7,7 +7,7 @@ server_name	username	db
 server1	user1	test0
 CREATE SERVER IF NOT EXISTS server1 FOREIGN DATA WRAPPER mysql OPTIONS (USER 'user2', HOST 'localhost', DATABASE 'test1');
 Warnings:
-Note	1476	The foreign server, server1, you are trying to create already exists.
+Note	1476	The foreign server, server1, you are trying to create already exists
 SELECT server_name, username, db FROM mysql.servers;
 server_name	username	db
 server1	user1	test0
@@ -21,10 +21,10 @@ server_name	username	db
 DROP SERVER IF EXISTS server1;
 CREATE SERVER server_1 FOREIGN DATA WRAPPER mysql OPTIONS (USER 'mysqltest_1', HOST 'localhost', DATABASE 'test0');
 CREATE SERVER server_1 FOREIGN DATA WRAPPER mysql OPTIONS (USER 'mysqltest_1', HOST 'localhost', DATABASE 'test1');
-ERROR HY000: The foreign server, server_1, you are trying to create already exists.
+ERROR HY000: The foreign server, server_1, you are trying to create already exists
 CREATE SERVER IF NOT EXISTS server_1 FOREIGN DATA WRAPPER mysql OPTIONS (USER 'mysqltest_1', HOST 'localhost', DATABASE 'test2');
 Warnings:
-Note	1476	The foreign server, server_1, you are trying to create already exists.
+Note	1476	The foreign server, server_1, you are trying to create already exists
 SELECT server_name, username, db FROM mysql.servers;
 server_name	username	db
 server_1	mysqltest_1	test0

mysql-test/r/delete.result

@@ -488,7 +488,7 @@ BEGIN
 INSERT INTO t1 SELECT * FROM t1 AS A;
 END |
 DELETE IGNORE FROM t1;
-ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
+ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger
 DROP TABLE t1;
 #
 # Bug #53450: Crash/assertion

mysql-test/r/dyncol.result

@@ -47,7 +47,7 @@ select hex(COLUMN_CREATE(1, 99999999999999999999999999999 AS unsigned int));
 hex(COLUMN_CREATE(1, 99999999999999999999999999999 AS unsigned int))
 000100010001FFFFFFFFFFFFFF7F
 Warnings:
-Warning	1916	Got overflow when converting '99999999999999999999999999999' to INT. Value truncated.
+Warning	1916	Got overflow when converting '99999999999999999999999999999' to INT. Value truncated
 select hex(COLUMN_CREATE(1, NULL AS int));
 hex(COLUMN_CREATE(1, NULL AS int))
 000000
@@ -73,7 +73,7 @@ select hex(COLUMN_CREATE(1, 99999999999999999999999999999 AS int));
 hex(COLUMN_CREATE(1, 99999999999999999999999999999 AS int))
 000100010000FEFFFFFFFFFFFFFF
 Warnings:
-Warning	1916	Got overflow when converting '99999999999999999999999999999' to INT. Value truncated.
+Warning	1916	Got overflow when converting '99999999999999999999999999999' to INT. Value truncated
 select hex(COLUMN_CREATE(1, NULL AS double));
 hex(COLUMN_CREATE(1, NULL AS double))
 000000
@@ -223,7 +223,7 @@ select column_get(column_create(1, 99999999999999999999999999999 AS decimal), 1
 column_get(column_create(1, 99999999999999999999999999999 AS decimal), 1 as unsigned int)
 18446744073709551615
 Warnings:
-Warning	1916	Got overflow when converting '99999999999999999999999999999' to UNSIGNED INT. Value truncated.
+Warning	1916	Got overflow when converting '99999999999999999999999999999' to UNSIGNED INT. Value truncated
 select column_get(column_create(1, 999.9999999999999999 AS decimal), 1 as unsigned int);
 column_get(column_create(1, 999.9999999999999999 AS decimal), 1 as unsigned int)
 1000
@@ -231,12 +231,12 @@ select column_get(column_create(1, -1 AS decimal), 1 as unsigned int);
 column_get(column_create(1, -1 AS decimal), 1 as unsigned int)
 0
 Warnings:
-Warning	1916	Got overflow when converting '-1' to UNSIGNED INT. Value truncated.
+Warning	1916	Got overflow when converting '-1' to UNSIGNED INT. Value truncated
 select column_get(column_create(1, 99999999999999999999999999999 AS double), 1 as unsigned int);
 column_get(column_create(1, 99999999999999999999999999999 AS double), 1 as unsigned int)
 18446744073709551615
 Warnings:
-Warning	1916	Got overflow when converting '1e29' to UNSIGNED INT. Value truncated.
+Warning	1916	Got overflow when converting '1e29' to UNSIGNED INT. Value truncated
 select column_get(column_create(1, 999.9 AS double), 1 as unsigned int);
 column_get(column_create(1, 999.9 AS double), 1 as unsigned int)
 1000
@@ -244,7 +244,7 @@ select column_get(column_create(1, -1 AS double), 1 as unsigned int);
 column_get(column_create(1, -1 AS double), 1 as unsigned int)
 0
 Warnings:
-Warning	1916	Got overflow when converting '-1' to UNSIGNED INT. Value truncated.
+Warning	1916	Got overflow when converting '-1' to UNSIGNED INT. Value truncated
 select column_get(column_create(1, "1212III" AS char), 1 as unsigned int);
 column_get(column_create(1, "1212III" AS char), 1 as unsigned int)
 1212
@@ -314,12 +314,12 @@ select column_get(column_create(1, 99999999999999999999999999999 AS decimal), 1
 column_get(column_create(1, 99999999999999999999999999999 AS decimal), 1 as int)
 9223372036854775807
 Warnings:
-Warning	1916	Got overflow when converting '99999999999999999999999999999' to INT. Value truncated.
+Warning	1916	Got overflow when converting '99999999999999999999999999999' to INT. Value truncated
 select column_get(column_create(1, -99999999999999999999999999999 AS decimal), 1 as int);
 column_get(column_create(1, -99999999999999999999999999999 AS decimal), 1 as int)
 -9223372036854775808
 Warnings:
-Warning	1916	Got overflow when converting '-99999999999999999999999999999' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-99999999999999999999999999999' to INT. Value truncated
 select column_get(column_create(1, 999.9999999999999999 AS decimal), 1 as int);
 column_get(column_create(1, 999.9999999999999999 AS decimal), 1 as int)
 1000
@@ -330,7 +330,7 @@ select column_get(column_create(1, -99999999999999999999999999999 AS double), 1
 column_get(column_create(1, -99999999999999999999999999999 AS double), 1 as int)
 -9223372036854775808
 Warnings:
-Warning	1916	Got overflow when converting '-1e29' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-1e29' to INT. Value truncated
 select column_get(column_create(1, "-1212III" AS char), 1 as int);
 column_get(column_create(1, "-1212III" AS char), 1 as int)
 -1212
@@ -1459,7 +1459,7 @@ Note	1105	Cast to signed converted positive out-of-range integer to it's negativ
 #             mysqld
 #
 SELECT COLUMN_GET(`x`, 'y' AS DECIMAL(5,50));
-ERROR 42000: Too big scale 50 specified for ''y''. Maximum is 38.
+ERROR 42000: Too big scale 50 specified for ''y''. Maximum is 38
 #
 # test of symbolic names
 #

mysql-test/r/events_2.result

@@ -262,13 +262,13 @@ begin
 alter event e1 rename to e2;
 return 1;
 end|
-ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
 create function f1() returns int
 begin
 drop event e2;
 return 1;
 end|
-ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
 ----------------------------------------------------------------------
 create trigger trg before insert on t1 for each row
 begin
@@ -309,14 +309,14 @@ begin
 alter event e1 rename to e2;
 end|
 insert into t1 (a) values (1)|
-ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
 drop procedure p1|
 create procedure p1()
 begin
 drop event e1;
 end|
 insert into t1 (a) values (1)|
-ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
 drop table t1|
 drop event e1|
 set names utf8;
@@ -379,7 +379,7 @@ do
 select 1;
 alter event event_35981 on schedule every 1 hour starts '1999-01-01 00:00:00'
   ends '1999-01-02 00:00:00';
-ERROR HY000: Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was not changed. Specify a time in the future.
+ERROR HY000: Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was not changed. Specify a time in the future
 drop event event_35981;
 create event event_35981 on schedule every 1 hour starts current_timestamp
 on completion not preserve
@@ -400,7 +400,7 @@ Warnings:
 Note	1544	Event execution time is in the past. Event has been disabled
 alter event event_35981 on schedule every 1 hour starts '1999-01-01 00:00:00'
   ends '1999-01-02 00:00:00' on completion not preserve;
-ERROR HY000: Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was not changed. Specify a time in the future.
+ERROR HY000: Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was not changed. Specify a time in the future
 alter event event_35981 on schedule every 1 hour starts '1999-01-01 00:00:00'
   ends '1999-01-02 00:00:00' on completion preserve;
 Warnings:

mysql-test/r/events_bugs.result

@@ -38,7 +38,7 @@ create event e_55 on schedule at 10000101000000 do drop table t;
 ERROR HY000: Incorrect AT value: '10000101000000'
 create event e_55 on schedule at 20000101000000 do drop table t;
 Warnings:
-Note	1588	Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation.
+Note	1588	Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation
 show events;
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
 create event e_55 on schedule at 20200101000000 starts 10000101000000 do drop table t;
@@ -224,13 +224,13 @@ connection default;
 drop user mysqltest_user1@localhost;
 drop database mysqltest_db1;
 create event e_53 on schedule at (select s1 from ttx) do drop table t;
-ERROR 42000: CREATE/ALTER EVENT does not support subqueries or stored functions.
+ERROR 42000: CREATE/ALTER EVENT does not support subqueries or stored functions
 create event e_53 on schedule every (select s1 from ttx) second do drop table t;
-ERROR 42000: CREATE/ALTER EVENT does not support subqueries or stored functions.
+ERROR 42000: CREATE/ALTER EVENT does not support subqueries or stored functions
 create event e_53 on schedule every 5 second starts (select s1 from ttx) do drop table t;
-ERROR 42000: CREATE/ALTER EVENT does not support subqueries or stored functions.
+ERROR 42000: CREATE/ALTER EVENT does not support subqueries or stored functions
 create event e_53 on schedule every 5 second ends (select s1 from ttx) do drop table t;
-ERROR 42000: CREATE/ALTER EVENT does not support subqueries or stored functions.
+ERROR 42000: CREATE/ALTER EVENT does not support subqueries or stored functions
 drop event if exists e_16;
 drop procedure if exists p_16;
 create event e_16 on schedule every 1 second do set @a=5;
@@ -271,7 +271,7 @@ begin
 call p22830_wait();
 select 123;
 end|
-ERROR 42000: CREATE/ALTER EVENT does not support subqueries or stored functions.
+ERROR 42000: CREATE/ALTER EVENT does not support subqueries or stored functions
 create event e22830_1 on schedule every 1 hour do
 begin
 call p22830_wait();
@@ -463,32 +463,32 @@ e3		+00:00	CREATE DEFINER=`root`@`localhost` EVENT `e3` ON SCHEDULE EVERY 1 DAY
 The following should fail, and nothing should be altered.
 ALTER EVENT e1 ON SCHEDULE EVERY 1 HOUR STARTS '1999-01-01 00:00:00'
   ENDS '1999-01-02 00:00:00';
-ERROR HY000: Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was not changed. Specify a time in the future.
+ERROR HY000: Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was not changed. Specify a time in the future
 ALTER EVENT e1 ON SCHEDULE EVERY 1 HOUR STARTS '1999-01-01 00:00:00'
   ENDS '1999-01-02 00:00:00' DISABLE;
-ERROR HY000: Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was not changed. Specify a time in the future.
+ERROR HY000: Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was not changed. Specify a time in the future
 The following should give warnings, and nothing should be created.
 CREATE EVENT e4 ON SCHEDULE EVERY 1 HOUR STARTS '1999-01-01 00:00:00'
   ENDS '1999-01-02 00:00:00'
 DO
 SELECT 1;
 Warnings:
-Note	1588	Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation.
+Note	1588	Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation
 CREATE EVENT e4 ON SCHEDULE EVERY 1 HOUR STARTS '1999-01-01 00:00:00'
   ENDS '1999-01-02 00:00:00' DISABLE
 DO
 SELECT 1;
 Warnings:
-Note	1588	Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation.
+Note	1588	Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation
 CREATE EVENT e4 ON SCHEDULE AT '1999-01-01 00:00:00' DO
 SELECT 1;
 Warnings:
-Note	1588	Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation.
+Note	1588	Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation
 CREATE EVENT e4 ON SCHEDULE AT '1999-01-01 00:00:00' DISABLE
 DO
 SELECT 1;
 Warnings:
-Note	1588	Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation.
+Note	1588	Event execution time is in the past and ON COMPLETION NOT PRESERVE is set. The event was dropped immediately after creation
 SHOW EVENTS;
 Db	Name	Definer	Time zone	Type	Execute at	Interval value	Interval field	Starts	Ends	Status	Originator	character_set_client	collation_connection	Database Collation
 events_test	e1	root@localhost	+05:00	RECURRING	NULL	1	DAY	2006-01-01 00:00:00	NULL	ENABLED	1	latin1	latin1_swedish_ci	latin1_swedish_ci

mysql-test/r/func_math.result

@@ -534,7 +534,7 @@ select "123456789012345678901234567890.123456789012345678901234567890" div 1 as
 ERROR 22003: BIGINT value is out of range in '('123456789012345678901234567890.123456789012345678901234567890' DIV 1)'
 SHOW WARNINGS;
 Level	Code	Message
-Warning	1916	Got overflow when converting '123456789012345678901234567890' to INT. Value truncated.
+Warning	1916	Got overflow when converting '123456789012345678901234567890' to INT. Value truncated
 Error	1690	BIGINT value is out of range in '('123456789012345678901234567890.123456789012345678901234567890' DIV 1)'
 #
 # Bug#57810 case/when/then : Assertion failed: length || !scale
@@ -741,7 +741,7 @@ select (1.175494351E-37 div 1.7976931348623157E+308);
 (1.175494351E-37 div 1.7976931348623157E+308)
 0
 Warnings:
-Warning	1916	Got overflow when converting '' to DECIMAL. Value truncated.
+Warning	1916	Got overflow when converting '' to DECIMAL. Value truncated
 #
 # Bug#12744991 - DECIMAL_ROUND(X,D) GIVES WRONG RESULTS WHEN D == N*(-9)
 #

mysql-test/r/func_time.result

@@ -1976,7 +1976,7 @@ select microsecond('12:00:00.123456'), microsecond('2009-12-31 23:59:59.000010')
 microsecond('12:00:00.123456')	microsecond('2009-12-31 23:59:59.000010')
 123456	10
 select now(258);
-ERROR 42000: Too big precision 258 specified for 'now'. Maximum is 6.
+ERROR 42000: Too big precision 258 specified for 'now'. Maximum is 6
 SELECT 1 FROM DUAL WHERE YEAR(TIMEDIFF(NULL, '12:12:12'));
 1
 SELECT 1 FROM DUAL WHERE MONTH(TIMEDIFF(NULL, '12:12:12'));

mysql-test/r/func_time_hires.result

@@ -24,9 +24,9 @@ select time_to_sec(sec_to_time(11111)), time_to_sec(sec_to_time(11111.22222));
 time_to_sec(sec_to_time(11111))	11111
 time_to_sec(sec_to_time(11111.22222))	11111.22222
 select current_timestamp(7);
-ERROR 42000: Too big precision 7 specified for 'now'. Maximum is 6.
+ERROR 42000: Too big precision 7 specified for 'now'. Maximum is 6
 select curtime(7);
-ERROR 42000: Too big precision 7 specified for 'curtime'. Maximum is 6.
+ERROR 42000: Too big precision 7 specified for 'curtime'. Maximum is 6
 drop table if exists t1;
 create table t1 select sec_to_time(12345), sec_to_time(12345.6789),
 sec_to_time(1234567e-2), now(), curtime(0),
@@ -161,7 +161,7 @@ select cast(cast(@a as time(2)) as time(6));
 cast(cast(@a as time(2)) as time(6))
 12:13:14.120000
 select CAST(@a AS DATETIME(7));
-ERROR 42000: Too big precision 7 specified for '(@`a`)'. Maximum is 6.
+ERROR 42000: Too big precision 7 specified for '(@`a`)'. Maximum is 6
 SELECT CONVERT_TZ('2011-01-02 12:00:00', '+00:00', '+03:00');
 CONVERT_TZ('2011-01-02 12:00:00', '+00:00', '+03:00')
 2011-01-02 15:00:00

mysql-test/r/get_diagnostics.result

@@ -273,11 +273,11 @@ SELECT CAST(-19999999999999999999 AS SIGNED);
 CAST(-19999999999999999999 AS SIGNED)
 -9223372036854775808
 Warnings:
-Warning	1916	Got overflow when converting '-19999999999999999999' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-19999999999999999999' to INT. Value truncated
 GET DIAGNOSTICS @var = NUMBER;
 SHOW WARNINGS;
 Level	Code	Message
-Warning	1916	Got overflow when converting '-19999999999999999999' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-19999999999999999999' to INT. Value truncated
 #
 # If GET DIAGNOSTICS itself causes an error, an error message is appended.
 #
@@ -285,14 +285,14 @@ SELECT CAST(-19999999999999999999 AS SIGNED);
 CAST(-19999999999999999999 AS SIGNED)
 -9223372036854775808
 Warnings:
-Warning	1916	Got overflow when converting '-19999999999999999999' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-19999999999999999999' to INT. Value truncated
 GET DIAGNOSTICS CONDITION 99999 @var = CLASS_ORIGIN;
 Warnings:
-Warning	1916	Got overflow when converting '-19999999999999999999' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-19999999999999999999' to INT. Value truncated
 Error	1758	Invalid condition number
 SHOW WARNINGS;
 Level	Code	Message
-Warning	1916	Got overflow when converting '-19999999999999999999' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-19999999999999999999' to INT. Value truncated
 Error	1758	Invalid condition number
 
 # Statement information runtime
@@ -302,8 +302,8 @@ CAST(-19999999999999999999 AS SIGNED);
 CAST(-19999999999999999999 AS SIGNED)	CAST(-19999999999999999999 AS SIGNED)
 -9223372036854775808	-9223372036854775808
 Warnings:
-Warning	1916	Got overflow when converting '-19999999999999999999' to INT. Value truncated.
-Warning	1916	Got overflow when converting '-19999999999999999999' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-19999999999999999999' to INT. Value truncated
+Warning	1916	Got overflow when converting '-19999999999999999999' to INT. Value truncated
 GET DIAGNOSTICS @var = NUMBER;
 SELECT @var;
 @var
@@ -353,7 +353,7 @@ SELECT CAST(-19999999999999999999 AS SIGNED);
 CAST(-19999999999999999999 AS SIGNED)
 -9223372036854775808
 Warnings:
-Warning	1916	Got overflow when converting '-19999999999999999999' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-19999999999999999999' to INT. Value truncated
 GET DIAGNOSTICS CONDITION 1
 @class_origin = CLASS_ORIGIN,
 @subclass_origin = SUBCLASS_ORIGIN,
@@ -392,7 +392,7 @@ SELECT
 @table_name	
 @column_name	
 @cursor_name	
-@message_text	Got overflow when converting '-19999999999999999999' to INT. Value truncated.
+@message_text	Got overflow when converting '-19999999999999999999' to INT. Value truncated
 @mysql_errno	1916
 @returned_sqlstate	22003
 CREATE PROCEDURE p1()
@@ -452,13 +452,13 @@ schema_name
 table_name	
 column_name	
 cursor_name	
-message_text	Got overflow when converting '-19999999999999999999' to INT. Value truncated.
+message_text	Got overflow when converting '-19999999999999999999' to INT. Value truncated
 mysql_errno	1916
 returned_sqlstate	22003
 Warnings:
 Level	Warning
 Code	1916
-Message	Got overflow when converting '-19999999999999999999' to INT. Value truncated.
+Message	Got overflow when converting '-19999999999999999999' to INT. Value truncated
 DROP PROCEDURE p1;
 CREATE PROCEDURE p1()
 BEGIN
@@ -475,13 +475,13 @@ END|
 CALL p1();
 CAST(-19999999999999999999 AS SIGNED)	-9223372036854775808
 errno1	1916
-msg1	Got overflow when converting '-19999999999999999999' to INT. Value truncated.
+msg1	Got overflow when converting '-19999999999999999999' to INT. Value truncated
 errno2	1758
 msg2	Invalid condition number
 Warnings:
 Level	Warning
 Code	1916
-Message	Got overflow when converting '-19999999999999999999' to INT. Value truncated.
+Message	Got overflow when converting '-19999999999999999999' to INT. Value truncated
 Level	Error
 Code	1758
 Message	Invalid condition number
@@ -769,7 +769,7 @@ SELECT CAST(-19999999999999999999 AS SIGNED);
 CAST(-19999999999999999999 AS SIGNED)
 -9223372036854775808
 Warnings:
-Warning	1916	Got overflow when converting '-19999999999999999999' to INT. Value truncated.
+Warning	1916	Got overflow when converting '-19999999999999999999' to INT. Value truncated
 GET DIAGNOSTICS CONDITION 1 @var1 = MESSAGE_TEXT, @var2 = CLASS_ORIGIN;
 SELECT CHARSET(@var1), COLLATION(@var1), COERCIBILITY(@var1);
 CHARSET(@var1)	COLLATION(@var1)	COERCIBILITY(@var1)

mysql-test/r/gis-alter_table_online.result

@@ -6,39 +6,39 @@
 #
 CREATE TABLE t1 (a TINYBLOB);
 ALTER TABLE t1 MODIFY a GEOMETRY, ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
 DROP TABLE t1;
 CREATE TABLE t1 (a MEDIUMBLOB);
 ALTER TABLE t1 MODIFY a GEOMETRY, ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
 DROP TABLE t1;
 CREATE TABLE t1 (a BLOB);
 ALTER TABLE t1 MODIFY a GEOMETRY, ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
 DROP TABLE t1;
 CREATE TABLE t1 (a LONGBLOB);
 ALTER TABLE t1 MODIFY a GEOMETRY, ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
 DROP TABLE t1;
 CREATE TABLE t1 (a GEOMETRY);
 ALTER TABLE t1 MODIFY a TINYBLOB, ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
 DROP TABLE t1;
 CREATE TABLE t1 (a GEOMETRY);
 ALTER TABLE t1 MODIFY a MEDIUMBLOB, ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
 DROP TABLE t1;
 CREATE TABLE t1 (a GEOMETRY);
 ALTER TABLE t1 MODIFY a BLOB, ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
 DROP TABLE t1;
 CREATE TABLE t1 (a GEOMETRY);
 ALTER TABLE t1 MODIFY a LONGBLOB, ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
 DROP TABLE t1;
 CREATE TABLE t1 (a GEOMETRY);
 ALTER TABLE t1 MODIFY a POLYGON, ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY.
+ERROR 0A000: ALGORITHM=INPLACE is not supported for this operation. Try ALGORITHM=COPY
 DROP TABLE t1;
 CREATE TABLE t1 (a POLYGON);
 ALTER TABLE t1 MODIFY a GEOMETRY, ALGORITHM=INPLACE;

mysql-test/r/group_min_max.result

@@ -2562,7 +2562,7 @@ a	MIN(b)	MAX(b)	AVG(b)
 DROP TABLE t1;
 create table t1 (a int, b int, key (a,b), key `index` (a,b)) engine=MyISAM;
 Warnings:
-Note	1831	Duplicate index 'index' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'index' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 insert into  t1 (a,b) values 
 (0,0),(0,1),(0,2),(0,3),(0,4),(0,5),(0,6),
 (0,7),(0,8),(0,9),(0,10),(0,11),(0,12),(0,13),

mysql-test/r/index_merge_myisam.result

@@ -224,7 +224,7 @@ index i2_1(key2, key2_1),
 index i2_2(key2, key2_1)
 );
 Warnings:
-Note	1831	Duplicate index 'i2_2' defined on the table 'test.t4'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'i2_2' defined on the table 'test.t4'. This is deprecated and will be disallowed in a future release
 insert into t4 select key1,key1,key1 div 10, key1 % 10, key1 % 10, key1 from t0;
 select * from t4 where key1a = 3 or key1b = 4;
 key1a	key1b	key2	key2_1	key2_2	key3

mysql-test/r/information_schema.result

@@ -508,10 +508,10 @@ create table t1 (a int null, primary key(a));
 alter table t1 add constraint constraint_1 unique (a);
 alter table t1 add constraint unique key_1(a);
 Warnings:
-Note	1831	Duplicate index 'key_1' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'key_1' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 alter table t1 add constraint constraint_2 unique key_2(a);
 Warnings:
-Note	1831	Duplicate index 'key_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'key_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (

mysql-test/r/innodb_icp.result

@@ -722,8 +722,8 @@ b INT, c INT, d DATE NOT NULL, e VARCHAR(1),
 KEY (c), KEY (d), KEY k2(b), KEY k3(b), KEY k4(b)
 );
 Warnings:
-Note	1831	Duplicate index 'k3' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'k4' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'k3' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'k4' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 INSERT INTO t1 (b,c,d,e) VALUES
 (6,5,'2006-05-25','y'),(1,5,'2008-01-23','t'),
 (6,5,'2007-06-18','d'),(4,5,'1900-01-01','r'),

mysql-test/r/innodb_mysql_sync.result

@@ -327,7 +327,7 @@ SET DEBUG_SYNC= 'now SIGNAL continue3';
 connection default;
 # Reaping ALTER TABLE ...
 Warnings:
-Note	1831	Duplicate index 'i2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'i2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 SET DEBUG_SYNC= 'RESET';
 DELETE FROM t1 WHERE a= 3;
 #
@@ -377,7 +377,7 @@ SET DEBUG_SYNC= 'now SIGNAL continue4';
 connection default;
 # Reaping ALTER TABLE ...
 Warnings:
-Note	1831	Duplicate index 'i4' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'i4' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 SET DEBUG_SYNC= 'RESET';
 connection default;
 disconnect con1;

mysql-test/r/insert.result

@@ -417,19 +417,19 @@ f2()
 INSERT INTO t1 VALUES (3);
 INSERT DELAYED INTO t1 VALUES (4);
 INSERT INTO t1 VALUES (f1());
-ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
+ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger
 INSERT DELAYED INTO t1 VALUES (f1());
-ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
+ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger
 INSERT INTO t1 VALUES (f2());
-ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
+ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger
 INSERT DELAYED INTO t1 VALUES (f2());
-ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
+ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger
 CREATE TRIGGER t1_bi BEFORE INSERT ON t1 FOR EACH ROW
 INSERT INTO t1 VALUES (NEW.i);
 INSERT INTO t1 VALUES (1);
-ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
+ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger
 INSERT DELAYED INTO t1 VALUES (1);
-ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
+ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger
 SELECT * FROM t1;
 i
 1

mysql-test/r/key.result

@@ -428,7 +428,7 @@ index i5 (c1, c2, c3, c4),
 primary key (c2, c3),
 index (c2, c4));
 Warnings:
-Note	1831	Duplicate index 'i1' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'i1' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -448,17 +448,17 @@ t1	CREATE TABLE `t1` (
 alter table t1 drop index c1;
 alter table t1 add index (c1);
 Warnings:
-Note	1831	Duplicate index 'c1' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'c1' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 alter table t1 add index (c1);
 Warnings:
-Note	1831	Duplicate index 'c1_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'c1_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 alter table t1 drop index i3;
 alter table t1 add index i3 (c3);
 alter table t1 drop index i2, drop index i4;
 alter table t1 add index i2 (c2), add index i4 (c4);
 alter table t1 drop index i2, drop index i4, add index i6 (c2, c4);
 Warnings:
-Note	1831	Duplicate index 'i6' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'i6' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 alter table t1 add index i2 (c2), add index i4 (c4), drop index i6;
 alter table t1 drop index i2, drop index i4, add unique i4 (c4);
 alter table t1 add index i2 (c2), drop index i4, add index i4 (c4);

mysql-test/r/kill.result

@@ -35,7 +35,7 @@ SELECT 4;
 4
 connection default;
 KILL (SELECT COUNT(*) FROM mysql.user);
-ERROR 42000: KILL does not support subqueries or stored functions.
+ERROR 42000: KILL does not support subqueries or stored functions
 connection con1;
 connection con2;
 connection con1;

mysql-test/r/lock.result

@@ -444,7 +444,7 @@ UPDATE LOW_PRIORITY t1 SET f2 = 7;
 # Statement below should fail with ER_CANT_UPDATE_USED_TABLE_IN_SF_OR_TRG
 # error instead of failing on assertion in table-level locking subsystem.
 INSERT INTO t1(f1) VALUES(0);
-ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
+ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger
 DROP TABLE t1;
 #
 # Bug#43685 Lock table affects other non-related tables

mysql-test/r/log_tables.result

@@ -42,15 +42,15 @@ on (mysql.general_log.command_type = join_test.command_type)
 drop table join_test;
 flush logs;
 lock tables mysql.general_log WRITE;
-ERROR HY000: You can't use locks with log tables.
+ERROR HY000: You can't use locks with log tables
 lock tables mysql.slow_log WRITE;
-ERROR HY000: You can't use locks with log tables.
+ERROR HY000: You can't use locks with log tables
 lock tables mysql.general_log READ;
-ERROR HY000: You can't use locks with log tables.
+ERROR HY000: You can't use locks with log tables
 lock tables mysql.slow_log READ;
-ERROR HY000: You can't use locks with log tables.
+ERROR HY000: You can't use locks with log tables
 lock tables mysql.slow_log READ LOCAL, mysql.general_log READ LOCAL;
-ERROR HY000: You can't use locks with log tables.
+ERROR HY000: You can't use locks with log tables
 show create table mysql.general_log;
 Table	Create Table
 general_log	CREATE TABLE `general_log` (
@@ -245,13 +245,13 @@ TIMESTAMP	USER_HOST	THREAD_ID	1	Query	set global slow_query_log='ON'
 TIMESTAMP	USER_HOST	THREAD_ID	1	Query	select * from mysql.general_log
 flush logs;
 lock tables mysql.general_log WRITE;
-ERROR HY000: You can't use locks with log tables.
+ERROR HY000: You can't use locks with log tables
 lock tables mysql.slow_log WRITE;
-ERROR HY000: You can't use locks with log tables.
+ERROR HY000: You can't use locks with log tables
 lock tables mysql.general_log READ;
-ERROR HY000: You can't use locks with log tables.
+ERROR HY000: You can't use locks with log tables
 lock tables mysql.slow_log READ;
-ERROR HY000: You can't use locks with log tables.
+ERROR HY000: You can't use locks with log tables
 set global general_log='OFF';
 set global slow_query_log='OFF';
 set @save_storage_engine= @@session.storage_engine;
@@ -301,7 +301,7 @@ flush tables with read lock;
 unlock tables;
 use mysql;
 lock tables general_log read local, help_category read local;
-ERROR HY000: You can't use locks with log tables.
+ERROR HY000: You can't use locks with log tables
 unlock tables;
 SET SESSION long_query_time = 1000;
 drop table if exists mysql.renamed_general_log;

mysql-test/r/lowercase_table2.result

@@ -138,7 +138,7 @@ Tables_in_test (T1%)
 T1
 alter table t1 add index (A);
 Warnings:
-Note	1831	Duplicate index 'A_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'A_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 show tables like 't1%';
 Tables_in_test (t1%)
 t1

mysql-test/r/merge.result

@@ -2785,14 +2785,14 @@ CREATE TRIGGER tm1_ai AFTER INSERT ON tm1
 FOR EACH ROW INSERT INTO t1 VALUES(11);
 LOCK TABLE tm1 WRITE, t1 WRITE;
 INSERT INTO tm1 VALUES (1);
-ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
+ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger
 SELECT * FROM tm1;
 c1
 1
 UNLOCK TABLES;
 LOCK TABLE t1 WRITE, tm1 WRITE;
 INSERT INTO tm1 VALUES (1);
-ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
+ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger
 SELECT * FROM tm1;
 c1
 1
@@ -3711,9 +3711,9 @@ ERROR HY000: Table 'm1' is specified twice, both as a target for 'INSERT' and as
 insert into m1 (a) values ((select max(a) from tmp, t2));
 ERROR HY000: Table 'm1' is specified twice, both as a target for 'INSERT' and as a separate source for data
 insert into m1 (a) values ((select max(a) from v1));
-ERROR HY000: The definition of table 'v1' prevents operation INSERT on table 'm1'.
+ERROR HY000: The definition of table 'v1' prevents operation INSERT on table 'm1'
 insert into m1 (a) values ((select max(a) from tmp, v1));
-ERROR HY000: The definition of table 'v1' prevents operation INSERT on table 'm1'.
+ERROR HY000: The definition of table 'v1' prevents operation INSERT on table 'm1'
 update m1 set a = ((select max(a) from m1));
 ERROR HY000: Table 'm1' is specified twice, both as a target for 'UPDATE' and as a separate source for data
 update m1 set a = ((select max(a) from m2));
@@ -3739,9 +3739,9 @@ ERROR HY000: Table 'm1' is specified twice, both as a target for 'UPDATE' and as
 update m1 set a = ((select max(a) from tmp, t2));
 ERROR HY000: Table 'm1' is specified twice, both as a target for 'UPDATE' and as a separate source for data
 update m1 set a = ((select max(a) from v1));
-ERROR HY000: The definition of table 'v1' prevents operation UPDATE on table 'm1'.
+ERROR HY000: The definition of table 'v1' prevents operation UPDATE on table 'm1'
 update m1 set a = ((select max(a) from tmp, v1));
-ERROR HY000: The definition of table 'v1' prevents operation UPDATE on table 'm1'.
+ERROR HY000: The definition of table 'v1' prevents operation UPDATE on table 'm1'
 delete from m1 where a = (select max(a) from m1);
 ERROR HY000: Table 'm1' is specified twice, both as a target for 'DELETE' and as a separate source for data
 delete from m1 where a = (select max(a) from m2);
@@ -3767,9 +3767,9 @@ ERROR HY000: Table 'm1' is specified twice, both as a target for 'DELETE' and as
 delete from m1 where a = (select max(a) from tmp, t2);
 ERROR HY000: Table 'm1' is specified twice, both as a target for 'DELETE' and as a separate source for data
 delete from m1 where a = (select max(a) from v1);
-ERROR HY000: The definition of table 'v1' prevents operation DELETE on table 'm1'.
+ERROR HY000: The definition of table 'v1' prevents operation DELETE on table 'm1'
 delete from m1 where a = (select max(a) from tmp, v1);
-ERROR HY000: The definition of table 'v1' prevents operation DELETE on table 'm1'.
+ERROR HY000: The definition of table 'v1' prevents operation DELETE on table 'm1'
 drop view v1;
 drop temporary table tmp;
 drop table t1, t2, t3, m1, m2;

mysql-test/r/mix2_myisam.result

@@ -257,7 +257,7 @@ drop table t1;
 CREATE TABLE t1 (a int not null, b int not null,c int not null,
 key(a),primary key(a,b), unique(c),key(a),unique(b)) ENGINE = MyISAM;
 Warnings:
-Note	1831	Duplicate index 'a_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'a_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 show index from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
 t1	0	PRIMARY	1	a	A	#	NULL	NULL		BTREE		
@@ -1550,7 +1550,7 @@ alter table t1 add unique(v);
 ERROR 23000: Duplicate entry '{ ' for key 'v_2'
 alter table t1 add key(v);
 Warnings:
-Note	1831	Duplicate index 'v_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'v_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 select concat('*',v,'*',c,'*',t,'*') as qq from t1 where v='a';
 qq
 *a*a*a*

mysql-test/r/mrr_icp_extra.result

@@ -351,7 +351,7 @@ alter table t1 add unique(v);
 ERROR 23000: Duplicate entry '{ ' for key 'v_2'
 alter table t1 add key(v);
 Warnings:
-Note	1831	Duplicate index 'v_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'v_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 select concat('*',v,'*',c,'*',t,'*') as qq from t1 where v='a';
 qq
 *a*a*a*

mysql-test/r/multi_update_innodb.result

@@ -10,13 +10,13 @@ PRIMARY KEY (pk)
 ) ENGINE=InnoDB;
 INSERT INTO t1 VALUES (0,0,0);
 UPDATE t1 AS A, t1 AS B SET A.pk = 1, B.a = 2;
-ERROR HY000: Primary key/partition key update is not allowed since the table is updated both as 'A' and 'B'.
+ERROR HY000: Primary key/partition key update is not allowed since the table is updated both as 'A' and 'B'
 SELECT * FROM t1;
 pk	a	b
 0	0	0
 CREATE VIEW v1 AS SELECT * FROM t1;
 UPDATE v1 AS A, t1 AS B SET A.pk = 1, B.a = 2;
-ERROR HY000: Primary key/partition key update is not allowed since the table is updated both as 'A' and 'B'.
+ERROR HY000: Primary key/partition key update is not allowed since the table is updated both as 'A' and 'B'
 SELECT * FROM t1;
 pk	a	b
 0	0	0
@@ -51,17 +51,17 @@ primary key (pk_1,pk_2)
 INSERT INTO t2 VALUES (1,2,3,4);
 
 UPDATE t1 AS A NATURAL JOIN t1 B SET A.pk=5,B.pk=7;
-ERROR HY000: Primary key/partition key update is not allowed since the table is updated both as 'A' and 'B'.
+ERROR HY000: Primary key/partition key update is not allowed since the table is updated both as 'A' and 'B'
 
 SELECT * FROM t1;
 col_int_key	pk	col_int
 1	2	3
 
 UPDATE t2 AS A NATURAL JOIN t2 B SET A.pk_1=5,B.pk_1=7;
-ERROR HY000: Primary key/partition key update is not allowed since the table is updated both as 'A' and 'B'.
+ERROR HY000: Primary key/partition key update is not allowed since the table is updated both as 'A' and 'B'
 
 UPDATE t2 AS A NATURAL JOIN t2 B SET A.pk_2=10,B.pk_2=11;
-ERROR HY000: Primary key/partition key update is not allowed since the table is updated both as 'A' and 'B'.
+ERROR HY000: Primary key/partition key update is not allowed since the table is updated both as 'A' and 'B'
 
 SELECT * FROM t2;
 col_int_key	pk_1	pk_2	col_int

mysql-test/r/myisam.result

@@ -1254,7 +1254,7 @@ alter table t1 add unique(v);
 ERROR 23000: Duplicate entry '{ ' for key 'v_2'
 alter table t1 add key(v);
 Warnings:
-Note	1831	Duplicate index 'v_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'v_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 select concat('*',v,'*',c,'*',t,'*') as qq from t1 where v='a';
 qq
 *a*a*a*
@@ -2465,8 +2465,8 @@ SET myisam_repair_threads=2;
 SET myisam_sort_buffer_size=4096;
 CREATE TABLE t1(a CHAR(255), KEY(a), KEY(a), KEY(a));
 Warnings:
-Note	1831	Duplicate index 'a_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'a_3' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'a_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'a_3' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 INSERT INTO t1 VALUES (0),(1),(2),(3),(4),(5),(6),(7),(8),(9),(0),(1),(2),(3);
 REPAIR TABLE t1;
 Table	Op	Msg_type	Msg_text

mysql-test/r/myisam_icp.result

@@ -720,8 +720,8 @@ b INT, c INT, d DATE NOT NULL, e VARCHAR(1),
 KEY (c), KEY (d), KEY k2(b), KEY k3(b), KEY k4(b)
 );
 Warnings:
-Note	1831	Duplicate index 'k3' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
-Note	1831	Duplicate index 'k4' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'k3' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
+Note	1831	Duplicate index 'k4' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 INSERT INTO t1 (b,c,d,e) VALUES
 (6,5,'2006-05-25','y'),(1,5,'2008-01-23','t'),
 (6,5,'2007-06-18','d'),(4,5,'1900-01-01','r'),

mysql-test/r/mysql57_virtual.result

@@ -14,7 +14,7 @@ a	b	c
 1	2	4
 2	3	5
 alter online table mysql57_virtual comment "I am now a MariaDB table";
-ERROR 0A000: LOCK=NONE is not supported. Reason: COPY algorithm requires a lock. Try LOCK=SHARED.
+ERROR 0A000: LOCK=NONE is not supported. Reason: COPY algorithm requires a lock. Try LOCK=SHARED
 alter table mysql57_virtual comment "I am now a MariaDB table";
 SHOW CREATE TABLE mysql57_virtual;
 Table	Create Table

mysql-test/r/partition.result

@@ -300,7 +300,7 @@ create index i on t1 (a);
 ERROR 42000: Duplicate key name 'i'
 create index i2 on t1 (a);
 Warnings:
-Note	1831	Duplicate index 'i2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'i2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 drop table t1;
 CREATE TABLE t1 (a INT, FOREIGN KEY (a) REFERENCES t0 (a))
 ENGINE=MyISAM
@@ -2467,16 +2467,16 @@ partkey	nokey
 # Case 1
 # Update is refused because partitioning key is updated
 UPDATE t1_part AS A NATURAL JOIN t1_part B SET A.partkey = 2, B.nokey = 3;
-ERROR HY000: Primary key/partition key update is not allowed since the table is updated both as 'A' and 'B'.
+ERROR HY000: Primary key/partition key update is not allowed since the table is updated both as 'A' and 'B'
 UPDATE t1_part AS A NATURAL JOIN t1_part B SET A.nokey = 2, B.partkey = 3;
-ERROR HY000: Primary key/partition key update is not allowed since the table is updated both as 'A' and 'B'.
+ERROR HY000: Primary key/partition key update is not allowed since the table is updated both as 'A' and 'B'
 
 # Case 2
 # Like 1, but partition accessed through a view
 UPDATE t1_part AS A NATURAL JOIN v1 as B SET A.nokey = 2 , B.partkey = 3;
-ERROR HY000: Primary key/partition key update is not allowed since the table is updated both as 'A' and 'B'.
+ERROR HY000: Primary key/partition key update is not allowed since the table is updated both as 'A' and 'B'
 UPDATE v1 AS A NATURAL JOIN t1_part as B SET A.nokey = 2 , B.partkey = 3;
-ERROR HY000: Primary key/partition key update is not allowed since the table is updated both as 'A' and 'B'.
+ERROR HY000: Primary key/partition key update is not allowed since the table is updated both as 'A' and 'B'
 
 # Should be (1,1),(10,10)
 SELECT * FROM t1_part;

mysql-test/r/partition_innodb.result

@@ -616,7 +616,7 @@ c INT,
 PRIMARY KEY (c,a), KEY (a),KEY (a)
 ) ENGINE=INNODB PARTITION BY KEY () PARTITIONS 2;
 Warnings:
-Note	1831	Duplicate index 'a_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'a_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 INSERT INTO t1 VALUES (1,5,1),(2,4,1),(3,3,1),(4,2,1),(5,1,1);
 UPDATE t1 SET b = 0, c=1 WHERE a <=>0;
 SELECT * FROM t1;

mysql-test/r/ps.result

@@ -2566,7 +2566,7 @@ call proc_1();
 Got one of the listed errors
 drop procedure proc_1;
 create function func_1() returns int begin install plugin my_plug soname '/tmp/plugin'; return 1; end|
-ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
 select func_1(), func_1(), func_1() from dual;
 ERROR 42000: FUNCTION test.func_1 does not exist
 drop function func_1;
@@ -2582,7 +2582,7 @@ call proc_1();
 ERROR 42000: PLUGIN my_plug does not exist
 drop procedure proc_1;
 create function func_1() returns int begin uninstall plugin my_plug; return 1; end|
-ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
 select func_1(), func_1(), func_1() from dual;
 ERROR 42000: FUNCTION test.func_1 does not exist
 drop function func_1;
@@ -2607,7 +2607,7 @@ call proc_1();
 drop database if exists mysqltest_xyz;
 drop procedure proc_1;
 create function func_1() returns int begin create database mysqltest_xyz; return 1; end|
-ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
 select func_1(), func_1(), func_1() from dual;
 ERROR 42000: FUNCTION test.func_1 does not exist
 drop function func_1;
@@ -2670,7 +2670,7 @@ call proc_1();
 drop user pstest_xyz@localhost;
 drop procedure proc_1;
 create function func_1() returns int begin create user pstest_xyz@localhost; return 1; end|
-ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
 select func_1(), func_1(), func_1() from dual;
 ERROR 42000: FUNCTION test.func_1 does not exist
 drop function func_1;
@@ -2709,7 +2709,7 @@ call proc_1();
 drop event xyz;
 drop procedure proc_1;
 create function func_1() returns int begin alter event xyz comment 'xyz'; return 1; end|
-ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
 prepare abc from "alter event xyz comment 'xyz'";
 ERROR HY000: This command is not supported in the prepared statement protocol yet
 deallocate prepare abc;
@@ -2724,7 +2724,7 @@ call proc_1();
 ERROR HY000: Unknown event 'xyz'
 drop procedure proc_1;
 create function func_1() returns int begin drop event xyz; return 1; end|
-ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
 prepare abc from "drop event xyz";
 ERROR HY000: This command is not supported in the prepared statement protocol yet
 deallocate prepare abc;

mysql-test/r/set_statement.result

@@ -924,10 +924,10 @@ RETURN mx;
 END|
 SET STATEMENT myisam_repair_threads=(select max(v1) from t1) FOR
 select 1;
-ERROR 42000: SET STATEMENT does not support subqueries or stored functions.
+ERROR 42000: SET STATEMENT does not support subqueries or stored functions
 SET STATEMENT myisam_repair_threads=myProc() FOR
 select 1;
-ERROR 42000: SET STATEMENT does not support subqueries or stored functions.
+ERROR 42000: SET STATEMENT does not support subqueries or stored functions
 drop function myProc;
 drop table t1;
 set session binlog_format=mixed;

mysql-test/r/set_statement_notembedded_binlog.result

@@ -35,10 +35,10 @@ f1()
 1113
 111313
 Warnings:
-Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
-Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statements writing to a table with an auto-increment column after selecting from another table are unsafe because the order in which rows are retrieved determines what (if any) rows will be written. This order cannot be predicted and may differ on master and the slave.
-Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
-Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statements writing to a table with an auto-increment column after selecting from another table are unsafe because the order in which rows are retrieved determines what (if any) rows will be written. This order cannot be predicted and may differ on master and the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statements writing to a table with an auto-increment column after selecting from another table are unsafe because the order in which rows are retrieved determines what (if any) rows will be written. This order cannot be predicted and may differ on master and the slave
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statements writing to a table with an auto-increment column after selecting from another table are unsafe because the order in which rows are retrieved determines what (if any) rows will be written. This order cannot be predicted and may differ on master and the slave
 show binlog events limit 16, 100;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 x	x	x	x	x	LAST_INSERT_ID=0
@@ -77,10 +77,10 @@ f1()
 1113
 111313
 Warnings:
-Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
-Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statements writing to a table with an auto-increment column after selecting from another table are unsafe because the order in which rows are retrieved determines what (if any) rows will be written. This order cannot be predicted and may differ on master and the slave.
-Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
-Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statements writing to a table with an auto-increment column after selecting from another table are unsafe because the order in which rows are retrieved determines what (if any) rows will be written. This order cannot be predicted and may differ on master and the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statements writing to a table with an auto-increment column after selecting from another table are unsafe because the order in which rows are retrieved determines what (if any) rows will be written. This order cannot be predicted and may differ on master and the slave
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statements writing to a table with an auto-increment column after selecting from another table are unsafe because the order in which rows are retrieved determines what (if any) rows will be written. This order cannot be predicted and may differ on master and the slave
 show binlog events limit 13, 100;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 x	x	x	x	x	LAST_INSERT_ID=0

mysql-test/r/sp-lock.result

@@ -686,7 +686,7 @@ select @exec_count;
 set @@session.max_sp_recursion_depth=5;
 set @exec_count=0;
 call p1();
-ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
 select @exec_count;
 @exec_count
 0

mysql-test/r/sp.result

@@ -997,9 +997,9 @@ select f5(1)|
 f5(1)
 1
 select f5(2)|
-ERROR HY000: Recursive stored functions and triggers are not allowed.
+ERROR HY000: Recursive stored functions and triggers are not allowed
 select f5(3)|
-ERROR HY000: Recursive stored functions and triggers are not allowed.
+ERROR HY000: Recursive stored functions and triggers are not allowed
 create function f6() returns int
 begin
 declare n int;
@@ -1048,11 +1048,11 @@ ERROR HY000: View 'test.v1' references invalid table(s) or column(s) or function
 create function f1() returns int
 return (select sum(data) from t1) + (select sum(data) from v1)|
 select f1()|
-ERROR HY000: Recursive stored functions and triggers are not allowed.
+ERROR HY000: Recursive stored functions and triggers are not allowed
 select * from v1|
-ERROR HY000: Recursive stored functions and triggers are not allowed.
+ERROR HY000: Recursive stored functions and triggers are not allowed
 select * from v2|
-ERROR HY000: Recursive stored functions and triggers are not allowed.
+ERROR HY000: Recursive stored functions and triggers are not allowed
 drop function f1|
 create function f1() returns int
 return (select sum(data) from t1)|
@@ -4064,9 +4064,9 @@ select @@max_sp_recursion_depth|
 @@max_sp_recursion_depth
 4
 select bug10100f(3)|
-ERROR HY000: Recursive stored functions and triggers are not allowed.
+ERROR HY000: Recursive stored functions and triggers are not allowed
 select bug10100f(6)|
-ERROR HY000: Recursive stored functions and triggers are not allowed.
+ERROR HY000: Recursive stored functions and triggers are not allowed
 call bug10100t(5)|
 res
 120
@@ -4135,7 +4135,7 @@ select @@max_sp_recursion_depth|
 @@max_sp_recursion_depth
 0
 select bug10100f(5)|
-ERROR HY000: Recursive stored functions and triggers are not allowed.
+ERROR HY000: Recursive stored functions and triggers are not allowed
 call bug10100t(5)|
 ERROR HY000: Recursive limit 0 (as set by the max_sp_recursion_depth variable) was exceeded for routine bug10100p
 deallocate prepare stmt2|

mysql-test/r/sp_trans.result

@@ -122,19 +122,19 @@ begin
 alter table t1 add k int;
 return 1;
 end|
-ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
 create function bug10015_7() returns int
 begin
 start transaction;
 return 1;
 end|
-ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
 create function bug10015_7() returns int
 begin
 drop table t1;
 return 1;
 end|
-ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
 create function bug10015_7() returns int
 begin
 drop temporary table t1;
@@ -146,7 +146,7 @@ begin
 commit;
 return 1;
 end|
-ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
 create function bug10015_7() returns int
 begin
 call bug10015_8();
@@ -154,11 +154,11 @@ return 1;
 end|
 create procedure bug10015_8() alter table t1 add k int|
 select *, bug10015_7() from t1|
-ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
 drop procedure bug10015_8|
 create procedure bug10015_8() start transaction|
 select *, bug10015_7() from t1|
-ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
 drop procedure bug10015_8|
 create procedure bug10015_8() drop temporary table if exists t1_temp|
 select *, bug10015_7() from t1|
@@ -171,7 +171,7 @@ id	bug10015_7()
 drop procedure bug10015_8|
 create procedure bug10015_8() commit|
 select *, bug10015_7() from t1|
-ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
 drop procedure bug10015_8|
 drop function bug10015_7|
 drop table t1, t2|

mysql-test/r/subselect4.result

@@ -428,7 +428,7 @@ INSERT INTO `t1` VALUES (10,'00:00:00','i','i'),(11,'00:00:00','','');
 set @old_optimizer_switch          = @@session.optimizer_switch;
 SET SESSION OPTIMIZER_SWITCH = 'materialization=off,semijoin=off,loosescan=off,firstmatch=off,mrr=on,engine_condition_pushdown=on';
 Warnings:
-Warning	1681	'engine_condition_pushdown=on' is deprecated and will be removed in a future release.
+Warning	1681	'engine_condition_pushdown=on' is deprecated and will be removed in a future release
 SELECT `time_nokey` G1  FROM t1  WHERE ( `varchar_nokey`  , `varchar_key`  )  IN ( 
 SELECT `varchar_nokey`  , `varchar_nokey`  )  AND `varchar_key`  >= 'c' HAVING G1  ORDER 
 BY `pk`   ;
@@ -618,7 +618,7 @@ INSERT INTO t2 VALUES (9,1);
 set @old_icp=@@optimizer_switch;
 SET SESSION optimizer_switch="engine_condition_pushdown=on";
 Warnings:
-Warning	1681	'engine_condition_pushdown=on' is deprecated and will be removed in a future release.
+Warning	1681	'engine_condition_pushdown=on' is deprecated and will be removed in a future release
 
 SELECT pk
 FROM t2

mysql-test/r/temp_table.result

@@ -441,7 +441,7 @@ INSERT INTO temp_t1 VALUES(1);
 DROP TABLE temp_t1;
 RETURN 0;
 END|
-ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
 CREATE FUNCTION f2() RETURNS INT
 BEGIN
 DROP TEMPORARY TABLE IF EXISTS temp_t1;

mysql-test/r/trans_read_only.result

@@ -37,6 +37,6 @@ DROP TABLE t1;
 CREATE TABLE t1(a INT);
 START TRANSACTION READ ONLY;
 INSERT DELAYED INTO t1 VALUES (1);
-ERROR 25006: Cannot execute statement in a READ ONLY transaction.
+ERROR 25006: Cannot execute statement in a READ ONLY transaction
 COMMIT;
 DROP TABLE t1;

mysql-test/r/trigger-compat.result

@@ -20,7 +20,7 @@ CREATE TRIGGER wl2818_trg2 AFTER INSERT ON t1
 FOR EACH ROW
 INSERT INTO t2 VALUES(CURRENT_USER());
 Warnings:
-Warning	1454	No definer attribute for trigger 'mysqltest_db1'.'wl2818_trg1'. The trigger will be activated under the authorization of the invoker, which may have insufficient privileges. Please recreate the trigger.
+Warning	1454	No definer attribute for trigger 'mysqltest_db1'.'wl2818_trg1'. The trigger will be activated under the authorization of the invoker, which may have insufficient privileges. Please recreate the trigger
 
 SELECT trigger_name, definer FROM INFORMATION_SCHEMA.TRIGGERS ORDER BY trigger_name;
 trigger_name	definer
@@ -33,7 +33,7 @@ def	mysqltest_db1	wl2818_trg1	INSERT	def	mysqltest_db1	t1	1	NULL	INSERT INTO t2
 def	mysqltest_db1	wl2818_trg2	INSERT	def	mysqltest_db1	t1	1	NULL	INSERT INTO t2 VALUES(CURRENT_USER())	ROW	AFTER	NULL	NULL	OLD	NEW	#	NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION	mysqltest_dfn@localhost	latin1	latin1_swedish_ci	latin1_swedish_ci
 DROP TRIGGER wl2818_trg1;
 Warnings:
-Warning	1454	No definer attribute for trigger 'mysqltest_db1'.'wl2818_trg1'. The trigger will be activated under the authorization of the invoker, which may have insufficient privileges. Please recreate the trigger.
+Warning	1454	No definer attribute for trigger 'mysqltest_db1'.'wl2818_trg1'. The trigger will be activated under the authorization of the invoker, which may have insufficient privileges. Please recreate the trigger
 DROP TRIGGER wl2818_trg2;
 disconnect wl2818_definer_con;
 connection default;

mysql-test/r/trigger.result

@@ -783,7 +783,7 @@ for each row insert into t1 values (new.f2+1);
 set @SAVE_SP_RECURSION_LEVELS=@@max_sp_recursion_depth;
 set @@max_sp_recursion_depth=100;
 insert into t1 values (1);
-ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
+ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger
 set @@max_sp_recursion_depth=@SAVE_SP_RECURSION_LEVELS;
 select * from t1;
 f1
@@ -796,7 +796,7 @@ drop trigger t2_ai;
 create trigger t1_bu before update on t1
 for each row insert into t1 values (2);
 update t1 set f1= 10;
-ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
+ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger
 select * from t1;
 f1
 1
@@ -804,7 +804,7 @@ drop trigger t1_bu;
 create trigger t1_bu before update on t1
 for each row delete from t1 where f1=new.f1;
 update t1 set f1= 10;
-ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
+ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger
 select * from t1;
 f1
 1
@@ -1958,7 +1958,7 @@ DROP TRIGGER t_insert;
 CREATE TRIGGER t_insert AFTER INSERT ON t2 FOR EACH ROW BEGIN UPDATE t1,t2 SET
 date_insert=NOW(),b=b+1 WHERE t1.a=t2.b AND t2.a=NEW.a; END |
 INSERT INTO t2 (a,b) VALUES (3,5);
-ERROR HY000: Can't update table 't2' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
+ERROR HY000: Can't update table 't2' in stored function/trigger because it is already used by statement which invoked this stored function/trigger
 DROP TABLE t1;
 DROP TRIGGER t_insert;
 DROP TABLE t2;

mysql-test/r/type_blob.result

@@ -910,11 +910,11 @@ DROP TABLE b15776;
 CREATE TABLE b15776 (a year(-2));
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-2))' at line 1
 CREATE TABLE b15776 (a timestamp(4294967294));
-ERROR 42000: Too big precision 4294967294 specified for 'a'. Maximum is 6.
+ERROR 42000: Too big precision 4294967294 specified for 'a'. Maximum is 6
 CREATE TABLE b15776 (a timestamp(4294967295));
-ERROR 42000: Too big precision 4294967295 specified for 'a'. Maximum is 6.
+ERROR 42000: Too big precision 4294967295 specified for 'a'. Maximum is 6
 CREATE TABLE b15776 (a timestamp(4294967296));
-ERROR 42000: Too big precision 4294967296 specified for 'a'. Maximum is 6.
+ERROR 42000: Too big precision 4294967296 specified for 'a'. Maximum is 6
 CREATE TABLE b15776 (a timestamp(-1));
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-1))' at line 1
 CREATE TABLE b15776 (a timestamp(-2));

mysql-test/r/type_datetime_hires.result

 SET timestamp=UNIX_TIMESTAMP('2001-02-03 10:20:30');
 drop table if exists t1, t2, t3;
 create table t1 (a datetime(7));
-ERROR 42000: Too big precision 7 specified for 'a'. Maximum is 6.
+ERROR 42000: Too big precision 7 specified for 'a'. Maximum is 6
 create table t1 (a datetime(3), key(a));
 insert t1 values ('2010-12-11 00:20:03.1234');
 insert t1 values ('2010-12-11 15:47:11.1234');

mysql-test/r/type_decimal.result

@@ -477,7 +477,7 @@ ERROR 42000: You have an error in your SQL syntax; check the manual that corresp
 CREATE TABLE t1 (a_dec DECIMAL(-1,1));
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near '-1,1))' at line 1
 CREATE TABLE t1 (a_dec DECIMAL(0,11));
-ERROR 42000: For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column 'a_dec').
+ERROR 42000: For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column 'a_dec')
 create table t1(a decimal(7,3));
 insert into t1 values ('1'),('+1'),('-1'),('0000000001'),('+0000000001'),('-0000000001'),('10'),('+10'),('-10'),('0000000010'),('+0000000010'),('-0000000010'),('100'),('+100'),('-100'),('0000000100'),('+0000000100'),('-0000000100'),('1000'),('+1000'),('-1000'),('0000001000'),('+0000001000'),('-0000001000'),('10000'),('+10000'),('-10000'),('0000010000'),('+0000010000'),('-0000010000'),('100000'),('+100000'),('-100000'),('0000100000'),('+0000100000'),('-0000100000'),('1000000'),('+1000000'),('-1000000'),('0001000000'),('+0001000000'),('-0001000000'),('10000000'),('+10000000'),('-10000000'),('0010000000'),('+0010000000'),('-0010000000'),('100000000'),('+100000000'),('-100000000'),('0100000000'),('+0100000000'),('-0100000000'),('1000000000'),('+1000000000'),('-1000000000'),('1000000000'),('+1000000000'),('-1000000000');
 select * from t1;
@@ -722,7 +722,7 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 create table t1 (d decimal(66,0));
-ERROR 42000: Too big precision 66 specified for 'd'. Maximum is 65.
+ERROR 42000: Too big precision 66 specified for 'd'. Maximum is 65
 CREATE TABLE t1 (i INT, d1 DECIMAL(9,2), d2 DECIMAL(9,2));
 INSERT INTO t1 VALUES (1, 101.40, 21.40), (1, -80.00, 0.00),
 (2, 0.00, 0.00), (2, -13.20, 0.00), (2, 59.60, 46.40),

mysql-test/r/type_enum.result

@@ -2151,7 +2151,7 @@ CREATE TABLE t1 (a DOUBLE);
 INSERT INTO t1 VALUES (9e100);
 ALTER TABLE t1 MODIFY a ENUM('9e200','9e100');
 Warnings:
-Warning	1916	Got overflow when converting '9e100' to INT. Value truncated.
+Warning	1916	Got overflow when converting '9e100' to INT. Value truncated
 Warning	1265	Data truncated for column 'a' at row 1
 SELECT * FROM t1;
 a

mysql-test/r/type_float.result

@@ -133,7 +133,7 @@ min(a)
 -0.010
 drop table t1;
 create table t1 (a float(200,100), b double(200,100));
-ERROR 42000: Too big scale 100 specified for 'a'. Maximum is 30.
+ERROR 42000: Too big scale 100 specified for 'a'. Maximum is 30
 create table t1 (c20 char);
 insert into t1 values (5000.0);
 Warnings:
@@ -341,9 +341,9 @@ s
 drop table t1;
 End of 4.1 tests
 create table t1 (s1 float(0,2));
-ERROR 42000: For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column 's1').
+ERROR 42000: For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column 's1')
 create table t1 (s1 float(1,2));
-ERROR 42000: For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column 's1').
+ERROR 42000: For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column 's1')
 CREATE TABLE t1 (
 f1 real zerofill,
 f2 double zerofill,
@@ -727,7 +727,7 @@ DROP TABLE t1,t2;
 #
 create or replace table t1 (a double(40,30));
 create or replace table t1 (a double(40,31));
-ERROR 42000: Too big scale 31 specified for 'a'. Maximum is 30.
+ERROR 42000: Too big scale 31 specified for 'a'. Maximum is 30
 create or replace table t1 as select 1.01e1;
 show create table t1;
 Table	Create Table

mysql-test/r/type_newdecimal.result

@@ -838,12 +838,12 @@ select 9999999999999999999999999999999999999999999999999999999999999999999999999
 x
 99999999999999999999999999999999999999999999999999999999999999999
 Warnings:
-Warning	1916	Got overflow when converting '' to DECIMAL. Value truncated.
+Warning	1916	Got overflow when converting '' to DECIMAL. Value truncated
 select 9999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 + 1 as x;
 x
 100000000000000000000000000000000000000000000000000000000000000000
 Warnings:
-Warning	1916	Got overflow when converting '' to DECIMAL. Value truncated.
+Warning	1916	Got overflow when converting '' to DECIMAL. Value truncated
 select 0.190287977636363637 + 0.040372670 * 0 -  0;
 0.190287977636363637 + 0.040372670 * 0 -  0
 0.190287977636363637
@@ -919,19 +919,19 @@ select ln(14000) c1, convert(ln(14000),decimal(5,3)) c2, cast(ln(14000) as decim
 c1	c2	c3
 9.546812608597396	9.547	9.547
 select convert(ln(14000),decimal(2,3)) c1;
-ERROR 42000: For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column '').
+ERROR 42000: For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column '')
 select cast(ln(14000) as decimal(2,3)) c1;
-ERROR 42000: For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column '').
+ERROR 42000: For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column '')
 create table t1 (sl decimal(70,30));
-ERROR 42000: Too big precision 70 specified for 'sl'. Maximum is 65.
+ERROR 42000: Too big precision 70 specified for 'sl'. Maximum is 65
 create table t1 (sl decimal(32,39));
-ERROR 42000: Too big scale 39 specified for 'sl'. Maximum is 38.
+ERROR 42000: Too big scale 39 specified for 'sl'. Maximum is 38
 create table t1 (sl decimal(67,38));
-ERROR 42000: Too big precision 67 specified for 'sl'. Maximum is 65.
+ERROR 42000: Too big precision 67 specified for 'sl'. Maximum is 65
 create table t1 (sl decimal(0,50));
-ERROR 42000: Too big scale 50 specified for 'sl'. Maximum is 38.
+ERROR 42000: Too big scale 50 specified for 'sl'. Maximum is 38
 create table t1 (sl decimal(0,30));
-ERROR 42000: For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column 'sl').
+ERROR 42000: For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column 'sl')
 create table t1 (sl decimal(5, 5));
 show create table t1;
 Table	Create Table
@@ -1013,7 +1013,7 @@ select cast(@non_existing_user_var/2 as DECIMAL);
 cast(@non_existing_user_var/2 as DECIMAL)
 NULL
 create table t (d decimal(0,10));
-ERROR 42000: For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column 'd').
+ERROR 42000: For float(M,D), double(M,D) or decimal(M,D), M must be >= D (column 'd')
 CREATE TABLE t1 (
 my_float   FLOAT,
 my_double  DOUBLE,
@@ -1382,7 +1382,7 @@ create table t1 (c1 decimal(64));
 insert into t1 values(
 89000000000000000000000000000000000000000000000000000000000000000000000000000000000000000);
 Warnings:
-Warning	1916	Got overflow when converting '' to DECIMAL. Value truncated.
+Warning	1916	Got overflow when converting '' to DECIMAL. Value truncated
 Warning	1264	Out of range value for column 'c1' at row 1
 insert into t1 values(
 99999999999999999999999999999999999999999999999999999999999999999999999999999999999999999999 *
@@ -1429,7 +1429,7 @@ select cast(19999999999999999999 as unsigned);
 cast(19999999999999999999 as unsigned)
 18446744073709551615
 Warnings:
-Warning	1916	Got overflow when converting '19999999999999999999' to UNSIGNED INT. Value truncated.
+Warning	1916	Got overflow when converting '19999999999999999999' to UNSIGNED INT. Value truncated
 create table t1(a decimal(18));
 insert into t1 values(123456789012345678);
 alter table t1 modify column a decimal(19);
@@ -1482,12 +1482,12 @@ SELECT CAST(1 AS decimal(65,10));
 CAST(1 AS decimal(65,10))
 1.0000000000
 SELECT CAST(1 AS decimal(66,10));
-ERROR 42000: Too big precision 66 specified for '1'. Maximum is 65.
+ERROR 42000: Too big precision 66 specified for '1'. Maximum is 65
 SELECT CAST(1 AS decimal(65,38));
 CAST(1 AS decimal(65,38))
 1.00000000000000000000000000000000000000
 SELECT CAST(1 AS decimal(65,39));
-ERROR 42000: Too big scale 39 specified for '1'. Maximum is 38.
+ERROR 42000: Too big scale 39 specified for '1'. Maximum is 38
 CREATE TABLE t1 (a int DEFAULT NULL, b int DEFAULT NULL);
 INSERT INTO t1 VALUES (3,30), (1,10), (2,10);
 SELECT a+CAST(1 AS decimal(65,30)) AS aa, SUM(b) FROM t1 GROUP BY aa;
@@ -1496,7 +1496,7 @@ aa	SUM(b)
 3.000000000000000000000000000000	10
 4.000000000000000000000000000000	30
 SELECT a+CAST(1 AS decimal(65,49)) AS aa, SUM(b) FROM t1 GROUP BY aa;
-ERROR 42000: Too big scale 49 specified for '1'. Maximum is 38.
+ERROR 42000: Too big scale 49 specified for '1'. Maximum is 38
 DROP TABLE t1;
 CREATE TABLE t1 (a int DEFAULT NULL, b int DEFAULT NULL);
 INSERT INTO t1 VALUES (3,30), (1,10), (2,10);
@@ -1554,8 +1554,8 @@ SELECT substring(('M') FROM (999999999999999999999999999999999999999999999999999
 foo
 
 Warnings:
-Warning	1916	Got overflow when converting '999999999999999999999999999999999999999999999999999999999999999999999999999999999' to INT. Value truncated.
-Warning	1916	Got overflow when converting '999999999999999999999999999999999999999999999999999999999999999999999999999999999' to INT. Value truncated.
+Warning	1916	Got overflow when converting '999999999999999999999999999999999999999999999999999999999999999999999999999999999' to INT. Value truncated
+Warning	1916	Got overflow when converting '999999999999999999999999999999999999999999999999999999999999999999999999999999999' to INT. Value truncated
 SELECT min(999999999999999999999999999999999999999999999999999999999999999999999999999999999) AS foo;
 foo
 999999999999999999999999999999999999999999999999999999999999999999999999999999999
@@ -1563,7 +1563,7 @@ SELECT multipolygonfromtext(('4294967294.1'),(9999999999999999999999999999999999
 foo
 NULL
 Warnings:
-Warning	1916	Got overflow when converting '999999999999999999999999999999999999999999999999999999999999999999999999999999999' to INT. Value truncated.
+Warning	1916	Got overflow when converting '999999999999999999999999999999999999999999999999999999999999999999999999999999999' to INT. Value truncated
 SELECT convert((999999999999999999999999999999999999999999999999999999999999999999999999999999999), decimal(30,30)) AS foo;
 foo
 0.999999999999999999999999999999
@@ -1573,7 +1573,7 @@ SELECT bit_xor(99999999999999999999999999999999999999999999999999999999999999999
 foo
 9223372036854775807
 Warnings:
-Warning	1916	Got overflow when converting '999999999999999999999999999999999999999999999999999999999999999999999999999999999' to INT. Value truncated.
+Warning	1916	Got overflow when converting '999999999999999999999999999999999999999999999999999999999999999999999999999999999' to INT. Value truncated
 SELECT -(999999999999999999999999999999999999999999999999999999999999999999999999999999999) AS foo;
 foo
 -999999999999999999999999999999999999999999999999999999999999999999999999999999999
@@ -1714,7 +1714,7 @@ CREATE TABLE t1 SELECT
 /* 82 */ 1000000000000000000000000000000000000000000000000000000000000000000000000000000001
 AS c1;
 Warnings:
-Warning	1916	Got overflow when converting '' to DECIMAL. Value truncated.
+Warning	1916	Got overflow when converting '' to DECIMAL. Value truncated
 DESC t1;
 Field	Type	Null	Key	Default	Extra
 c1	decimal(65,0)	NO		NULL	

mysql-test/r/type_ranges.result

@@ -83,10 +83,10 @@ t1	1	options	2	flags	A	NULL	NULL	NULL		BTREE
 CREATE UNIQUE INDEX test on t1 ( auto ) ;
 CREATE INDEX test2 on t1 ( ulonglong,ulong) ;
 Warnings:
-Note	1831	Duplicate index 'test2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'test2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 CREATE INDEX test3 on t1 ( medium ) ;
 Warnings:
-Note	1831	Duplicate index 'test3' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'test3' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 DROP INDEX test ON t1;
 insert into t1 values (10, 1,1,1,1,1,1,1,1,1,1,1,1,1,NULL,0,0,0,1,1,1,1,'one','one');
 insert into t1 values (NULL,2,2,2,2,2,2,2,2,2,2,2,2,2,NULL,NULL,NULL,NULL,NULL,NULL,2,2,'two','two,one');
@@ -305,7 +305,7 @@ const	int(1)	NULL	NO		NULL		#
 drop table t1,t2,t3;
 create table t1 ( myfield INT NOT NULL, UNIQUE INDEX (myfield), unique (myfield), index(myfield));
 Warnings:
-Note	1831	Duplicate index 'myfield_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'myfield_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 drop table t1;
 create table t1 ( id integer unsigned not null primary key );
 create table t2 ( id integer unsigned not null primary key );

mysql-test/r/type_time_hires.result

 SET timestamp=UNIX_TIMESTAMP('2001-02-03 10:20:30');
 drop table if exists t1, t2, t3;
 create table t1 (a time(7));
-ERROR 42000: Too big precision 7 specified for 'a'. Maximum is 6.
+ERROR 42000: Too big precision 7 specified for 'a'. Maximum is 6
 create table t1 (a time(3), key(a));
 insert t1 values ('2010-12-11 00:20:03.1234');
 Warnings:

mysql-test/r/type_timestamp_hires.result

 SET timestamp=UNIX_TIMESTAMP('2001-02-03 10:20:30');
 drop table if exists t1, t2, t3;
 create table t1 (a timestamp(7));
-ERROR 42000: Too big precision 7 specified for 'a'. Maximum is 6.
+ERROR 42000: Too big precision 7 specified for 'a'. Maximum is 6
 create table t1 (a timestamp(3), key(a));
 insert t1 values ('2010-12-11 00:20:03.1234');
 insert t1 values ('2010-12-11 15:47:11.1234');

mysql-test/r/update.result

@@ -531,9 +531,9 @@ CREATE FUNCTION f1() RETURNS INT RETURN f1();
 CREATE TABLE t1 (i INT);
 INSERT INTO t1 VALUES (1);
 UPDATE t1 SET i = 3 WHERE f1();
-ERROR HY000: Recursive stored functions and triggers are not allowed.
+ERROR HY000: Recursive stored functions and triggers are not allowed
 UPDATE t1 SET i = f1();
-ERROR HY000: Recursive stored functions and triggers are not allowed.
+ERROR HY000: Recursive stored functions and triggers are not allowed
 DROP TABLE t1;
 DROP FUNCTION f1;
 End of 5.0 tests

mysql-test/r/variables.result

@@ -189,7 +189,7 @@ select @@concurrent_insert;
 AUTO
 set global timed_mutexes=ON;
 Warnings:
-Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release
 show variables like 'timed_mutexes';
 Variable_name	Value
 timed_mutexes	ON
@@ -198,7 +198,7 @@ VARIABLE_NAME	VARIABLE_VALUE
 TIMED_MUTEXES	ON
 set global timed_mutexes=0;
 Warnings:
-Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release
 show variables like 'timed_mutexes';
 Variable_name	Value
 timed_mutexes	OFF

mysql-test/suite/binlog/r/binlog_base64_flag.result

@@ -9,7 +9,7 @@ BINLOG '
 SVtYRxMBAAAAKQAAADQBAAAAABAAAAAAAAAABHRlc3QAAnQxAAEDAAE=
 SVtYRxcBAAAAIgAAAFYBAAAQABAAAAAAAAEAAf/+AgAAAA==
 ';
-ERROR HY000: The BINLOG statement of type `Table_map` was not preceded by a format description BINLOG statement.
+ERROR HY000: The BINLOG statement of type `Table_map` was not preceded by a format description BINLOG statement
 select * from t1;
 a
 1

mysql-test/suite/binlog/r/binlog_stm_blackhole.result

@@ -100,7 +100,7 @@ create table t3 like t1;
 insert into t1 select * from t3;
 replace into t1 select * from t3;
 Warnings:
-Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. REPLACE... SELECT is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are replaced. This order cannot be predicted and may differ on master and the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. REPLACE... SELECT is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are replaced. This order cannot be predicted and may differ on master and the slave
 select * from t1;
 a
 select * from t2;

mysql-test/suite/binlog/r/binlog_stm_ps.result

@@ -11,7 +11,7 @@ prepare s from "insert into t1 select 100 limit ?";
 set @a=100;
 execute s using @a;
 Warnings:
-Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted
 include/show_binlog_events.inc
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Gtid	#	#	GTID #-#-#

mysql-test/suite/binlog/r/binlog_stm_row.result

@@ -33,7 +33,7 @@ RELEASE_LOCK('Bug#34306')
 1
 connection con2;
 Warnings:
-Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave
 SELECT RELEASE_LOCK('Bug#34306');
 RELEASE_LOCK('Bug#34306')
 1

mysql-test/suite/binlog/r/binlog_stm_unsafe_warning.result

@@ -5,10 +5,10 @@ CREATE TABLE t1 (a int, b int, primary key (a));
 INSERT INTO t1 VALUES (1,2), (2,3);
 UPDATE t1 SET b='4' WHERE a=1 LIMIT 1;
 Warnings:
-Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted
 UPDATE t1 SET b='5' WHERE a=2 ORDER BY a LIMIT 1;
 Warnings:
-Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. The statement is unsafe because it uses a LIMIT clause. This is unsafe because the set of rows included cannot be predicted
 DROP TABLE t1;
 ### NOT filtered database => assertion: binlog disabled and warnings ARE NOT shown
 SET SQL_LOG_BIN= 0;
@@ -58,11 +58,11 @@ CREATE TABLE t1 (a VARCHAR(36), b VARCHAR(15));
 SET GLOBAL LOG_WARNINGS = 0;
 INSERT INTO t1 VALUES(UUID(), 'timestamp');
 Warnings:
-Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave
 SET GLOBAL LOG_WARNINGS = 1;
 INSERT INTO t1 VALUES(UUID(), 'timestamp');
 Warnings:
-Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave
 DROP TABLE t1;
 SET GLOBAL log_warnings = @old_log_warnings;
 # Count the number of times the "Unsafe" message was printed
@@ -76,10 +76,10 @@ insert into t1 values (1,1,1);
 insert into t1 values (RAND()*1000+10, RAND()*1000+10, RAND()*1000+10);
 update t1 set n1=rand() where n1=1;
 Warnings:
-Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave
 delete from t1 where n2=1 + rand()*0;
 Warnings:
-Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may return a different value on the slave
 drop table t1;
 DROP TABLE IF EXISTS t1, t2;
 CREATE TABLE t1 (a int);
@@ -92,18 +92,18 @@ RETURN 1;
 END |
 INSERT INTO t1 VALUES (0);
 Warnings:
-Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly
 SHOW WARNINGS;
 Level	Code	Message
-Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly
 SELECT sf_bug50192();
 sf_bug50192()
 1
 Warnings:
-Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly
 SHOW WARNINGS;
 Level	Code	Message
-Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly.
+Note	1592	Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. Statement is unsafe because it invokes a trigger or a stored function that inserts into an AUTO_INCREMENT column. Inserted values cannot be logged correctly
 DROP FUNCTION sf_bug50192;
 DROP TRIGGER tr_bug50192;
 DROP TABLE t1, t2;

mysql-test/suite/encryption/r/innodb-bad-key-change.result

@@ -39,12 +39,12 @@ SELECT * FROM t1;
 ERROR HY000: Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
 SHOW WARNINGS;
 Level	Code	Message
-Warning	192	 is encrypted but encryption service or used key_id is not available.  Can't continue reading table.
+Warning	192	Table test/t1 in tablespace # is encrypted but encryption service or used key_id is not available.  Can't continue reading table.
 Warning	192	Table test/t1 is encrypted but encryption service or used key_id 2 is not available.  Can't continue reading table.
 Error	1296	Got error 192 'Table encrypted but decryption failed. This could be because correct encryption management plugin is not loaded, used encryption key is not available or encryption method does not match.' from InnoDB
 DROP TABLE t1;
 Warnings:
-Warning	192	 encrypted.However key management plugin or used key_id 1 is not found or used encryption algorithm or method does not match. Can't continue opening the table.
+Warning	192	Table in tablespace # encrypted.However key management plugin or used key_id 1 is not found or used encryption algorithm or method does not match. Can't continue opening the table.
 # Start server with keys.txt
 CREATE TABLE t2 (c VARCHAR(8), id int not null primary key, b int, key(b)) ENGINE=InnoDB ENCRYPTED=YES;
 INSERT INTO t2 VALUES ('foobar',1,2);

mysql-test/suite/encryption/t/innodb-bad-key-change.test

@@ -56,12 +56,16 @@ SELECT * FROM t1;
 
 --error ER_GET_ERRMSG
 SELECT * FROM t1;
+<<<<<<< HEAD
 --replace_regex /.*tablespace [0-9]*//
+=======
+--replace_regex /tablespace [0-9]*/tablespace #/
+>>>>>>> Remove end . from error messages to get them consistent
 SHOW WARNINGS;
 
 -- let $restart_parameters=--file-key-management-filename=$MYSQL_TEST_DIR/std_data/keysbad3.txt
 -- source include/restart_mysqld.inc
---replace_regex /.*tablespace [0-9]*//
+--replace_regex /tablespace [0-9]*/tablespace #/
 DROP TABLE t1;
 
 #

mysql-test/suite/funcs_1/r/innodb_trig_08.result

@@ -525,14 +525,14 @@ Start transaction;
 Set new.f120='U';
 Commit;
 END//
-ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
 Create trigger trg9_2 before delete on tb3 for each row
 BEGIN
 Start transaction;
 Set @var2=old.f120;
 Rollback;
 END//
-ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
 connection default;
 drop user test_general@localhost;
 drop user test_general;

mysql-test/suite/funcs_1/r/innodb_trig_1011ext.result

@@ -269,7 +269,7 @@ for each row insert into t4 (f4) values (new.f3+1);
 create trigger tr4 after insert on t4
 for each row insert into t1 (f1) values (new.f4+1);
 insert into t1 values (1);
-ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
+ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger
 select * from t1 order by f1;
 f1
 0
@@ -334,7 +334,7 @@ select @counter;
 @counter
 0
 call trig_sp();
-ERROR HY000: Can't update table 't1_sp' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
+ERROR HY000: Can't update table 't1_sp' in stored function/trigger because it is already used by statement which invoked this stored function/trigger
 select @counter;
 @counter
 2

mysql-test/suite/funcs_1/r/is_table_privileges.result

@@ -233,7 +233,7 @@ test	t1_table
 test	t1_view
 RENAME TABLE test.t1_table TO db_datadict.t1_table;
 RENAME TABLE test.t1_view  TO db_datadict.t1_view;
-ERROR HY000: Changing schema from 'test' to 'db_datadict' is not allowed.
+ERROR HY000: Changing schema from 'test' to 'db_datadict' is not allowed
 SELECT DISTINCT table_schema,table_name FROM information_schema.table_privileges
 WHERE table_name LIKE 't1_%'
 ORDER BY table_schema,table_name;

mysql-test/suite/funcs_1/r/is_views.result

@@ -163,7 +163,7 @@ ORDER BY table_schema,table_name;
 table_schema	table_name
 test	t1_view
 RENAME TABLE test.t1_view TO db_datadict.t1_view;
-ERROR HY000: Changing schema from 'test' to 'db_datadict' is not allowed.
+ERROR HY000: Changing schema from 'test' to 'db_datadict' is not allowed
 DROP VIEW test.t1_view;
 CREATE VIEW db_datadict.t1_view AS SELECT * FROM test.t1_table;
 SELECT table_schema,table_name FROM information_schema.views

mysql-test/suite/funcs_1/r/memory_trig_08.result

@@ -525,14 +525,14 @@ Start transaction;
 Set new.f120='U';
 Commit;
 END//
-ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
 Create trigger trg9_2 before delete on tb3 for each row
 BEGIN
 Start transaction;
 Set @var2=old.f120;
 Rollback;
 END//
-ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
 connection default;
 drop user test_general@localhost;
 drop user test_general;

mysql-test/suite/funcs_1/r/memory_trig_1011ext.result

@@ -270,7 +270,7 @@ for each row insert into t4 (f4) values (new.f3+1);
 create trigger tr4 after insert on t4
 for each row insert into t1 (f1) values (new.f4+1);
 insert into t1 values (1);
-ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
+ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger
 select * from t1 order by f1;
 f1
 0
@@ -339,7 +339,7 @@ select @counter;
 @counter
 0
 call trig_sp();
-ERROR HY000: Can't update table 't1_sp' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
+ERROR HY000: Can't update table 't1_sp' in stored function/trigger because it is already used by statement which invoked this stored function/trigger
 select @counter;
 @counter
 2

mysql-test/suite/funcs_1/r/myisam_trig_08.result

@@ -525,14 +525,14 @@ Start transaction;
 Set new.f120='U';
 Commit;
 END//
-ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
 Create trigger trg9_2 before delete on tb3 for each row
 BEGIN
 Start transaction;
 Set @var2=old.f120;
 Rollback;
 END//
-ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger.
+ERROR HY000: Explicit or implicit commit is not allowed in stored function or trigger
 connection default;
 drop user test_general@localhost;
 drop user test_general;

mysql-test/suite/funcs_1/r/myisam_trig_1011ext.result

@@ -270,7 +270,7 @@ for each row insert into t4 (f4) values (new.f3+1);
 create trigger tr4 after insert on t4
 for each row insert into t1 (f1) values (new.f4+1);
 insert into t1 values (1);
-ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
+ERROR HY000: Can't update table 't1' in stored function/trigger because it is already used by statement which invoked this stored function/trigger
 select * from t1 order by f1;
 f1
 0
@@ -339,7 +339,7 @@ select @counter;
 @counter
 0
 call trig_sp();
-ERROR HY000: Can't update table 't1_sp' in stored function/trigger because it is already used by statement which invoked this stored function/trigger.
+ERROR HY000: Can't update table 't1_sp' in stored function/trigger because it is already used by statement which invoked this stored function/trigger
 select @counter;
 @counter
 2

mysql-test/suite/innodb/r/innodb-16k.result

@@ -341,7 +341,7 @@ k=@c,l=@c,m=@c,n=@c,o=@c,p=@c,q=@c,r=@c,s=@c,t=@c,u=@c;
 CREATE INDEX t1f ON t1 (f(767));
 UPDATE t1 SET a=@d,b=@d,c=@d,d=@d,e=@d,f=@d,g=@d,h=@d,i=@d,j=@d,
 k=@d,l=@d,m=@d,n=@d,o=@d,p=@d,q=@d,r=@d,s=@d,t=@d,u=@d;
-ERROR HY000: Undo log record is too big.
+ERROR HY000: Undo log record is too big
 BEGIN;
 UPDATE t1 SET a=@d,b=@d,c=@d,d=@d,e=@d;
 UPDATE t1 SET f=@d,g=@d,h=@d,i=@d,j=@d,k=@d,l=@d,m=@d,
@@ -375,7 +375,7 @@ CREATE INDEX t1s ON t1 (s(767));
 UPDATE t1 SET s=@e;
 CREATE INDEX t1t ON t1 (t(767));
 UPDATE t1 SET t=@e;
-ERROR HY000: Undo log record is too big.
+ERROR HY000: Undo log record is too big
 SHOW CREATE TABLE t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -553,10 +553,10 @@ PRIMARY KEY (b(10), a), INDEX (c(767)), INDEX(b(767))
 INSERT INTO bug12547647 VALUES (5,REPEAT('khdfo5AlOq',1900),REPEAT('g',7751));
 COMMIT;
 UPDATE bug12547647 SET c = REPEAT('b',16928);
-ERROR HY000: Undo log record is too big.
+ERROR HY000: Undo log record is too big
 SHOW WARNINGS;
 Level	Code	Message
-Error	1713	Undo log record is too big.
+Error	1713	Undo log record is too big
 DROP TABLE bug12547647;
 SET SESSION innodb_strict_mode = on;
 CREATE TABLE t1(

mysql-test/suite/innodb/r/innodb-index.result

@@ -66,7 +66,7 @@ alter table t1 add unique index (c), add index (d);
 affected rows: 0
 info: Records: 0  Duplicates: 0  Warnings: 1
 Warnings:
-Note	1831	Duplicate index 'd' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'd' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (

mysql-test/suite/innodb/r/innodb-wl5522-1.result

@@ -415,7 +415,7 @@ ALTER TABLE testdb_wl5522.t1 DISCARD TABLESPACE;
 restore: t1 .ibd and .cfg files
 ALTER TABLE testdb_wl5522.t1 IMPORT TABLESPACE;
 ALTER TABLE testdb_wl5522.t1 IMPORT TABLESPACE;
-ERROR HY000: Tablespace for table 'testdb_wl5522/t1' exists. Please DISCARD the tablespace before IMPORT.
+ERROR HY000: Tablespace for table 'testdb_wl5522/t1' exists. Please DISCARD the tablespace before IMPORT
 SELECT * FROM testdb_wl5522.t1 ORDER BY i;
 i
 100

mysql-test/suite/innodb/r/innodb-wl5522-zip.result

@@ -126,7 +126,7 @@ c1 INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
 c2 INT) ENGINE=InnoDB  ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
 INSERT INTO t1(c2) VALUES(1);
 ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: Tablespace for table 'test/t1' exists. Please DISCARD the tablespace before IMPORT.
+ERROR HY000: Tablespace for table 'test/t1' exists. Please DISCARD the tablespace before IMPORT
 SELECT * FROM t1;
 c1	c2
 1	1

mysql-test/suite/innodb/r/innodb-wl5522.result

@@ -118,7 +118,7 @@ c1 INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
 c2 INT) ENGINE=InnoDB;
 INSERT INTO t1(c2) VALUES(1);
 ALTER TABLE t1 IMPORT TABLESPACE;
-ERROR HY000: Tablespace for table 'test/t1' exists. Please DISCARD the tablespace before IMPORT.
+ERROR HY000: Tablespace for table 'test/t1' exists. Please DISCARD the tablespace before IMPORT
 SELECT * FROM t1;
 c1	c2
 1	1

mysql-test/suite/innodb/r/innodb.result

@@ -405,7 +405,7 @@ drop table t1;
 CREATE TABLE t1 (a int not null, b int not null,c int not null,
 key(a),primary key(a,b), unique(c),key(a),unique(b));
 Warnings:
-Note	1831	Duplicate index 'a_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'a_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 show index from t1;
 Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Null	Index_type	Comment	Index_comment
 t1	0	PRIMARY	1	a	A	#	NULL	NULL		BTREE		
@@ -1512,7 +1512,7 @@ t2	CREATE TABLE `t2` (
 ) ENGINE=InnoDB DEFAULT CHARSET=latin1
 create index id2 on t2 (id);
 Warnings:
-Note	1831	Duplicate index 'id2' defined on the table 'test.t2'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'id2' defined on the table 'test.t2'. This is deprecated and will be disallowed in a future release
 show create table t2;
 Table	Create Table
 t2	CREATE TABLE `t2` (
@@ -1919,7 +1919,7 @@ alter table t1 add unique(v);
 ERROR 23000: Duplicate entry '{ ' for key 'v_2'
 alter table t1 add key(v);
 Warnings:
-Note	1831	Duplicate index 'v_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'v_2' defined on the table 'test.t1'. This is deprecated and will be disallowed in a future release
 select concat('*',v,'*',c,'*',t,'*') as qq from t1 where v='a';
 qq
 *a*a*a*

mysql-test/suite/innodb/r/innodb_bug51378.result

@@ -5,7 +5,7 @@ col3 time not null) engine = innodb;
 create unique index idx on bug51378(col1, col2(31));
 alter table bug51378 add unique index idx2(col1, col2(31));
 Warnings:
-Note	1831	Duplicate index 'idx2' defined on the table 'test.bug51378'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'idx2' defined on the table 'test.bug51378'. This is deprecated and will be disallowed in a future release
 create unique index idx3 on bug51378(col1, col3);
 SHOW CREATE TABLE bug51378;
 Table	Create Table

mysql-test/suite/innodb_fts/r/innodb-fts-ddl.result

@@ -77,10 +77,10 @@ INSERT INTO fts_test (title,body) VALUES
 ('MySQL vs. YourSQL','In the following database comparison ...'),
 ('MySQL Security','When configured properly, MySQL ...');
 CREATE FULLTEXT INDEX idx on fts_test (title, body) LOCK=NONE;
-ERROR 0A000: LOCK=NONE is not supported. Reason: Fulltext index creation requires a lock. Try LOCK=SHARED.
+ERROR 0A000: LOCK=NONE is not supported. Reason: Fulltext index creation requires a lock. Try LOCK=SHARED
 CREATE FULLTEXT INDEX idx on fts_test (title, body);
 ALTER TABLE fts_test ROW_FORMAT=REDUNDANT, LOCK=NONE;
-ERROR 0A000: LOCK=NONE is not supported. Reason: InnoDB presently supports one FULLTEXT index creation at a time. Try LOCK=SHARED.
+ERROR 0A000: LOCK=NONE is not supported. Reason: InnoDB presently supports one FULLTEXT index creation at a time. Try LOCK=SHARED
 ALTER TABLE fts_test ROW_FORMAT=REDUNDANT;
 SELECT * FROM fts_test WHERE MATCH (title, body)
 AGAINST ('Tutorial' IN NATURAL LANGUAGE MODE);

mysql-test/suite/innodb_fts/r/innodb_fts_misc.result

@@ -1018,9 +1018,9 @@ CREATE TABLE `t21` (`a` text, `b` int not null,
 fulltext key (`a`), fulltext key (`a`)
 ) ENGINE=INNODB DEFAULT CHARSET=LATIN1;
 Warnings:
-Note	1831	Duplicate index 'a_2' defined on the table 'test.t21'. This is deprecated and will be disallowed in a future release.
+Note	1831	Duplicate index 'a_2' defined on the table 'test.t21'. This is deprecated and will be disallowed in a future release
 ALTER  TABLE `t21` ADD UNIQUE INDEX (`b`), ALGORITHM=INPLACE;
-ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: InnoDB presently supports one FULLTEXT index creation at a time. Try ALGORITHM=COPY.
+ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: InnoDB presently supports one FULLTEXT index creation at a time. Try ALGORITHM=COPY
 ALTER  TABLE `t21` ADD UNIQUE INDEX (`b`);
 DROP TABLE t21;
 CREATE TABLE `t21` (`a` text, `b` int not null,

mysql-test/suite/innodb_zip/r/16k.result

@@ -426,7 +426,7 @@ k=@c,l=@c,m=@c,n=@c,o=@c,p=@c,q=@c,r=@c,s=@c,t=@c,u=@c;
 CREATE INDEX t1f ON t1 (f(767));
 UPDATE t1 SET a=@d,b=@d,c=@d,d=@d,e=@d,f=@d,g=@d,h=@d,i=@d,j=@d,
 k=@d,l=@d,m=@d,n=@d,o=@d,p=@d,q=@d,r=@d,s=@d,t=@d,u=@d;
-ERROR HY000: Undo log record is too big.
+ERROR HY000: Undo log record is too big
 BEGIN;
 UPDATE t1 SET a=@d,b=@d,c=@d,d=@d,e=@d;
 UPDATE t1 SET f=@d,g=@d,h=@d,i=@d,j=@d,k=@d,l=@d,m=@d,
@@ -460,7 +460,7 @@ CREATE INDEX t1s ON t1 (s(767));
 UPDATE t1 SET s=@e;
 CREATE INDEX t1t ON t1 (t(767));
 UPDATE t1 SET t=@e;
-ERROR HY000: Undo log record is too big.
+ERROR HY000: Undo log record is too big
 CREATE INDEX t1u ON t1 (u(767));
 CREATE INDEX t1ut ON t1 (u(767), t(767));
 CREATE INDEX t1st ON t1 (s(767), t(767));
@@ -638,10 +638,10 @@ PRIMARY KEY (b(10), a), INDEX (c(767)), INDEX(b(767))
 INSERT INTO bug12547647 VALUES (5,REPEAT('khdfo5AlOq',1900),REPEAT('g',7751));
 COMMIT;
 UPDATE bug12547647 SET c = REPEAT('b',16928);
-ERROR HY000: Undo log record is too big.
+ERROR HY000: Undo log record is too big
 SHOW WARNINGS;
 Level	Code	Message
-Error	1713	Undo log record is too big.
+Error	1713	Undo log record is too big
 DROP TABLE bug12547647;
 SET SESSION innodb_strict_mode = off;
 CREATE TABLE t1(