SQL: error messages

remove unused error messages
reword ER_VERS_SYS_FIELD_NOT_HIDDEN->ER_VERS_SYS_FIELD_EXISTS

8 files changed, 41 insertions, 39 deletions

diff --git a/mysql-test/suite/versioning/r/alter.result b/mysql-test/suite/versioning/r/alter.result
index 2cac5d2f21a..d656c8ee46d 100644
--- a/mysql-test/suite/versioning/r/alter.result
+++ b/mysql-test/suite/versioning/r/alter.result
@@ -392,12 +392,12 @@ period for system_time(sys_trx_start, sys_trx_end)
 select * from t;
 a
 alter table t drop system versioning;
-ERROR HY000: System versioning field `sys_trx_start` is not hidden
+ERROR HY000: System versioning field `sys_trx_start` exists
 alter table t drop column sys_trx_start;
 select * from t;
 a
 alter table t drop system versioning;
-ERROR HY000: System versioning field `sys_trx_end` is not hidden
+ERROR HY000: System versioning field `sys_trx_end` exists
 alter table t drop column sys_trx_end;
 select * from t;
 a
diff --git a/mysql-test/suite/versioning/r/insert.result b/mysql-test/suite/versioning/r/insert.result
index 1993c5f3195..52f6e8824e5 100644
--- a/mysql-test/suite/versioning/r/insert.result
+++ b/mysql-test/suite/versioning/r/insert.result
@@ -290,7 +290,7 @@ insert into t1(x) values (1);
 ERROR HY000: Temporal operation requires `mysql.transaction_registry` (@@system_versioning_transaction_registry).
 set global system_versioning_transaction_registry= on;
 Warnings:
-Warning	4141	Transaction-based system versioning is EXPERIMENTAL and is subject to change in future.
+Warning	4134	Transaction-based system versioning is EXPERIMENTAL and is subject to change in future.
 create or replace table t1 (
 x int,
 y int as (x) virtual,
diff --git a/mysql-test/suite/versioning/r/online.result b/mysql-test/suite/versioning/r/online.result
index 19929f5aa41..267da5db8fa 100644
--- a/mysql-test/suite/versioning/r/online.result
+++ b/mysql-test/suite/versioning/r/online.result
@@ -14,7 +14,7 @@ alter table t drop system versioning, algorithm=inplace;
 ERROR 0A000: ALGORITHM=INPLACE is not supported. Reason: Not implemented for system-versioned tables. Try ALGORITHM=COPY
 set global system_versioning_transaction_registry=on;
 Warnings:
-Warning	4141	Transaction-based system versioning is EXPERIMENTAL and is subject to change in future.
+Warning	4134	Transaction-based system versioning is EXPERIMENTAL and is subject to change in future.
 create or replace table t (a int, b int) engine=innodb;
 alter table t
 add s bigint unsigned as row start,
diff --git a/mysql-test/suite/versioning/r/optimized.result b/mysql-test/suite/versioning/r/optimized.result
index fe96036b41b..443d0401771 100644
--- a/mysql-test/suite/versioning/r/optimized.result
+++ b/mysql-test/suite/versioning/r/optimized.result
@@ -17,64 +17,64 @@ a	b	b+0
 1	2	2
 3	4	4
 Warnings:
-Note	4111	Non-versioned field `b` in historical query
-Note	4111	Non-versioned field `b` in historical query
+Note	4110	Non-versioned field `b` in historical query
+Note	4110	Non-versioned field `b` in historical query
 select * from t for system_time as of timestamp now(6);
 a	b
 1	2
 3	4
 Warnings:
-Note	4111	Non-versioned field `b` in historical query
+Note	4110	Non-versioned field `b` in historical query
 select count(*) from t for system_time as of timestamp now(6) group by b;
 count(*)
 1
 1
 Warnings:
-Note	4111	Non-versioned field `b` in historical query
+Note	4110	Non-versioned field `b` in historical query
 select * from t for system_time as of timestamp now(6) order by b asc;
 a	b
 1	2
 3	4
 Warnings:
-Note	4111	Non-versioned field `b` in historical query
-Note	4111	Non-versioned field `b` in historical query
+Note	4110	Non-versioned field `b` in historical query
+Note	4110	Non-versioned field `b` in historical query
 select * from t for system_time as of timestamp now(6) order by b desc;
 a	b
 3	4
 1	2
 Warnings:
-Note	4111	Non-versioned field `b` in historical query
-Note	4111	Non-versioned field `b` in historical query
+Note	4110	Non-versioned field `b` in historical query
+Note	4110	Non-versioned field `b` in historical query
 select * from t for system_time as of timestamp now(6) group by a having a=2;
 a	b
 Warnings:
-Note	4111	Non-versioned field `b` in historical query
+Note	4110	Non-versioned field `b` in historical query
 select * from t for system_time as of timestamp now(6) group by b having b=2;
 a	b
 1	2
 Warnings:
-Note	4111	Non-versioned field `b` in historical query
-Note	4111	Non-versioned field `b` in historical query
-Note	4111	Non-versioned field `b` in historical query
+Note	4110	Non-versioned field `b` in historical query
+Note	4110	Non-versioned field `b` in historical query
+Note	4110	Non-versioned field `b` in historical query
 select a from t for system_time as of timestamp now(6) where b=2;
 a
 1
 Warnings:
-Note	4111	Non-versioned field `b` in historical query
+Note	4110	Non-versioned field `b` in historical query
 select a from t for system_time as of timestamp now(6) where b=NULL;
 a
 Warnings:
-Note	4111	Non-versioned field `b` in historical query
+Note	4110	Non-versioned field `b` in historical query
 select a from t for system_time as of timestamp now(6) where b is NULL;
 a
 Warnings:
-Note	4111	Non-versioned field `b` in historical query
+Note	4110	Non-versioned field `b` in historical query
 select count(*), b from t for system_time as of timestamp now(6) group by b having b=NULL;
 count(*)	b
 Warnings:
-Note	4111	Non-versioned field `b` in historical query
-Note	4111	Non-versioned field `b` in historical query
-Note	4111	Non-versioned field `b` in historical query
+Note	4110	Non-versioned field `b` in historical query
+Note	4110	Non-versioned field `b` in historical query
+Note	4110	Non-versioned field `b` in historical query
 select a, b from t;
 a	b
 1	2
@@ -89,9 +89,9 @@ a	b
 1	2
 3	4
 Warnings:
-Note	4111	Non-versioned field `b` in historical query
+Note	4110	Non-versioned field `b` in historical query
 select * from t for system_time as of timestamp now(6) where b is NULL;
 a	b
 Warnings:
-Note	4111	Non-versioned field `b` in historical query
+Note	4110	Non-versioned field `b` in historical query
 drop table t;
diff --git a/mysql-test/suite/versioning/r/partition.result b/mysql-test/suite/versioning/r/partition.result
index 2e93a29cf07..6d0269c6520 100644
--- a/mysql-test/suite/versioning/r/partition.result
+++ b/mysql-test/suite/versioning/r/partition.result
@@ -89,7 +89,7 @@ ERROR HY000: Wrong partitions for `t1`: must have at least one HISTORY and exact
 alter table t1 add partition (
 partition p1 history);
 Warnings:
-Warning	4114	Maybe missing parameters: no rotation condition for multiple HISTORY partitions.
+Warning	4113	Maybe missing parameters: no rotation condition for multiple HISTORY partitions.
 show create table t1;
 Table	Create Table
 t1	CREATE TABLE `t1` (
@@ -233,7 +233,7 @@ x
 ### warn about partition switching
 delete from t1;
 Warnings:
-Note	4115	Versioned table `test`.`t1`: switching from partition `p0` to `p1`
+Note	4114	Versioned table `test`.`t1`: switching from partition `p0` to `p1`
 select * from t1 partition (p0);
 x
 1
@@ -245,7 +245,7 @@ insert into t1 values (4), (5);
 ### warn about full partition
 delete from t1;
 Warnings:
-Warning	4113	Versioned table `test`.`t1`: partition `p1` is full, add more HISTORY partitions
+Warning	4112	Versioned table `test`.`t1`: partition `p1` is full, add more HISTORY partitions
 select * from t1 partition (p1) order by x;
 x
 3
@@ -259,7 +259,7 @@ alter table t1 partition by system_time limit 1 (
 partition p1 history,
 partition pn current);
 Warnings:
-Note	4113	Versioned table `test`.`t1`: partition `p1` is full, add more HISTORY partitions
+Note	4112	Versioned table `test`.`t1`: partition `p1` is full, add more HISTORY partitions
 ## rotation by INTERVAL
 create or replace table t1 (x int)
 with system versioning
@@ -289,7 +289,7 @@ x
 insert into t1 values (4);
 delete from t1;
 Warnings:
-Note	4115	Versioned table `test`.`t1`: switching from partition `p0` to `p1`
+Note	4114	Versioned table `test`.`t1`: switching from partition `p0` to `p1`
 select * from t1 partition (p1);
 x
 4
@@ -315,8 +315,8 @@ x
 ### warn about partition switching and about full partition
 delete from t1;
 Warnings:
-Note	4115	Versioned table `test`.`t1`: switching from partition `p0` to `p1`
-Warning	4113	Versioned table `test`.`t1`: partition `p1` is full, add more HISTORY partitions
+Note	4114	Versioned table `test`.`t1`: switching from partition `p0` to `p1`
+Warning	4112	Versioned table `test`.`t1`: partition `p1` is full, add more HISTORY partitions
 select * from t1 partition (p0sp0);
 x
 1
@@ -400,13 +400,13 @@ partition p1 history,
 partition p2 history,
 partition pn current);
 Warnings:
-Note	4115	Versioned table `test`.`t1`: switching from partition `p1` to `p2`
+Note	4114	Versioned table `test`.`t1`: switching from partition `p1` to `p2`
 delete from t1 where x = 1;
 Warnings:
-Warning	4113	Versioned table `test`.`t1`: partition `p2` is full, add more HISTORY partitions
+Warning	4112	Versioned table `test`.`t1`: partition `p2` is full, add more HISTORY partitions
 delete from t1 where x = 2;
 Warnings:
-Warning	4113	Versioned table `test`.`t1`: partition `p2` is full, add more HISTORY partitions
+Warning	4112	Versioned table `test`.`t1`: partition `p2` is full, add more HISTORY partitions
 # Test cleanup
 drop database test;
 create database test;
diff --git a/mysql-test/suite/versioning/r/select.result b/mysql-test/suite/versioning/r/select.result
index 7ef54566d1a..af5101738a4 100644
--- a/mysql-test/suite/versioning/r/select.result
+++ b/mysql-test/suite/versioning/r/select.result
@@ -206,7 +206,8 @@ ERROR HY000: Table `t1` is not system-versioned
 create or replace table t1 (x int) with system versioning;
 insert into t1 values (1);
 select * from t1 for system_time all for update;
-ERROR HY000: Versioned SELECT write-locking of history rows
+x
+1
 create or replace table t1 (a int not null auto_increment primary key) with system versioning;
 select * from (t1 as t2 left join t1 as t3 using (a)) natural left join t1;
 a
diff --git a/mysql-test/suite/versioning/r/select_sp.result b/mysql-test/suite/versioning/r/select_sp.result
index 253d8485a57..319def26b76 100644
--- a/mysql-test/suite/versioning/r/select_sp.result
+++ b/mysql-test/suite/versioning/r/select_sp.result
@@ -259,8 +259,9 @@ select * from t1 for system_time all;
 ERROR HY000: Table `t1` is not system-versioned
 create or replace table t1 (x int) with system versioning;
 insert into t1 values (1);
-select * from t1 for system_time all for update;
-ERROR HY000: Versioned SELECT write-locking of history rows
+select * from t1 for system_time as of now() for update;
+x
+1
 create or replace table t1 (a int not null auto_increment primary key) with system versioning;
 select * from (t1 as t2 left join t1 as t3 using (a)) natural left join t1;
 a
diff --git a/mysql-test/suite/versioning/r/trx_id.result b/mysql-test/suite/versioning/r/trx_id.result
index f7d7b4d16ec..800d61beba7 100644
--- a/mysql-test/suite/versioning/r/trx_id.result
+++ b/mysql-test/suite/versioning/r/trx_id.result
@@ -10,7 +10,7 @@ period for system_time (sys_trx_start, sys_trx_end)
 ERROR HY000: Temporal operation requires `mysql.transaction_registry` (@@system_versioning_transaction_registry).
 set global system_versioning_transaction_registry= 1;
 Warnings:
-Warning	4141	Transaction-based system versioning is EXPERIMENTAL and is subject to change in future.
+Warning	4134	Transaction-based system versioning is EXPERIMENTAL and is subject to change in future.
 create or replace table t1 (
 x int,
 sys_trx_start bigint(20) unsigned as row start invisible,
@@ -32,7 +32,7 @@ return if(cond = 1, '[CORRECT]', '[INCORRECT]');
 set @@system_versioning_alter_history=keep;
 set global system_versioning_transaction_registry=on;
 Warnings:
-Warning	4141	Transaction-based system versioning is EXPERIMENTAL and is subject to change in future.
+Warning	4134	Transaction-based system versioning is EXPERIMENTAL and is subject to change in future.
 create or replace table t1 (x int) engine innodb;
 insert into t1 values (1);
 alter table t1