diff --git a/mysql-test/suite/versioning/r/partition.result b/mysql-test/suite/versioning/r/partition.result
index 432165d916a..ef54f5bdfca 100644
--- a/mysql-test/suite/versioning/r/partition.result
+++ b/mysql-test/suite/versioning/r/partition.result
@@ -42,25 +42,25 @@ create or replace table t1 (x int)
 with system versioning
 partition by system_time (
 partition p0 as of current_timestamp);
-ERROR HY000: Wrong partitions consistency for `t1`: must have at least one 'VERSIONING' and exactly one last 'AS OF NOW'
+ERROR HY000: Wrong partitions consistency for `t1`: must have at least one VERSIONING and exactly one last AS OF CURRENT_TIMESTAMP
 create or replace table t1 (x int)
 with system versioning
 partition by system_time (
 partition p0 as of current_timestamp,
 partition p1 as of current_timestamp);
-ERROR HY000: Wrong partitions consistency for `t1`: must have at least one 'VERSIONING' and exactly one last 'AS OF NOW'
+ERROR HY000: Wrong partitions consistency for `t1`: must have at least one VERSIONING and exactly one last AS OF CURRENT_TIMESTAMP
 create or replace table t1 (x int)
 with system versioning
 partition by system_time (
 partition p0 versioning,
 partition p1 versioning);
-ERROR HY000: Wrong partitions consistency for `t1`: must have at least one 'VERSIONING' and exactly one last 'AS OF NOW'
+ERROR HY000: Wrong partitions consistency for `t1`: must have at least one VERSIONING and exactly one last AS OF CURRENT_TIMESTAMP
 create or replace table t1 (x int)
 with system versioning
 partition by system_time (
 partition pn as of current_timestamp,
 partition p0 versioning);
-ERROR HY000: Wrong partitions consistency for `t1`: must have at least one 'VERSIONING' and exactly one last 'AS OF NOW'
+ERROR HY000: Wrong partitions consistency for `t1`: must have at least one VERSIONING and exactly one last AS OF CURRENT_TIMESTAMP
 create or replace table t1 (x int)
 with system versioning
 partition by system_time (
@@ -68,7 +68,7 @@ partition p0 versioning,
 partition pn as of current_timestamp);
 alter table t1 add partition (
 partition p1 as of current_timestamp);
-ERROR HY000: Wrong partitions consistency for `t1`: must have at least one 'VERSIONING' and exactly one last 'AS OF NOW'
+ERROR HY000: Wrong partitions consistency for `t1`: must have at least one VERSIONING and exactly one last AS OF CURRENT_TIMESTAMP
 alter table t1 add partition (
 partition p1 versioning);
 Warnings:
@@ -87,10 +87,10 @@ t1	CREATE TABLE `t1` (
  PARTITION `pn` AS OF CURRENT_TIMESTAMP ENGINE = ${INNODB_OR_MYISAM})
 insert into t1 values (1), (2);
 alter table t1 drop partition pn;
-ERROR HY000: Wrong partitions consistency for `t1`: must have at least one 'VERSIONING' and exactly one last 'AS OF NOW'
+ERROR HY000: Wrong partitions consistency for `t1`: must have at least one VERSIONING and exactly one last AS OF CURRENT_TIMESTAMP
 alter table t1 drop partition p1;
 alter table t1 drop partition p0;
-ERROR HY000: Wrong partitions consistency for `t1`: must have at least one 'VERSIONING' and exactly one last 'AS OF NOW'
+ERROR HY000: Wrong partitions consistency for `t1`: must have at least one VERSIONING and exactly one last AS OF CURRENT_TIMESTAMP
 select x from t1;
 x
 1
@@ -209,7 +209,7 @@ x
 2
 delete from t1;
 Warnings:
-Note	4116	Switching from partition `p0` to `p1`
+Note	4116	Versioned table `test`.`t1`: switching from partition `p0` to `p1`
 select * from t1 partition (p0) for system_time all;
 x
 1
@@ -219,7 +219,7 @@ x
 insert into t1 values (3);
 delete from t1;
 Warnings:
-Warning	4114	Using full partition `p1`, need more VERSIONING partitions!
+Warning	4114	Versioned table `test`.`t1`: partition `p1` is full, add more VERSIONING partitions
 select * from t1 partition (p1) for system_time all;
 x
 2
@@ -252,7 +252,7 @@ x
 insert into t1 values (4);
 delete from t1;
 Warnings:
-Note	4116	Switching from partition `p0` to `p1`
+Note	4116	Versioned table `test`.`t1`: switching from partition `p0` to `p1`
 select * from t1 partition (p1) for system_time all;
 x
 4
@@ -274,8 +274,8 @@ x
 2
 delete from t1;
 Warnings:
-Note	4116	Switching from partition `p0` to `p1`
-Warning	4114	Using full partition `p1`, need more VERSIONING partitions!
+Note	4116	Versioned table `test`.`t1`: switching from partition `p0` to `p1`
+Warning	4114	Versioned table `test`.`t1`: partition `p1` is full, add more VERSIONING partitions
 select * from t1 partition (p0sp0) for system_time all;
 x
 1
diff --git a/sql/partition_info.cc b/sql/partition_info.cc
index f0dc999d677..073d42f921f 100644
--- a/sql/partition_info.cc
+++ b/sql/partition_info.cc
@@ -898,6 +898,7 @@ partition_info::vers_part_rotate(THD * thd)
       Sql_condition::WARN_LEVEL_WARN,
       WARN_VERS_PART_FULL,
       ER_THD(thd, WARN_VERS_PART_FULL),
+      table->s->db.str, table->s->table_name.str,
       vers_info->hist_part->partition_name);
     return vers_info->hist_part;
   }
@@ -910,6 +911,7 @@ partition_info::vers_part_rotate(THD * thd)
     Sql_condition::WARN_LEVEL_NOTE,
     WARN_VERS_PART_ROTATION,
     ER_THD(thd, WARN_VERS_PART_ROTATION),
+    table->s->db.str, table->s->table_name.str,
     old_part_name,
     vers_info->hist_part->partition_name);
 
diff --git a/sql/share/errmsg-utf8.txt b/sql/share/errmsg-utf8.txt
index e12f6cb258b..79089141052 100644
--- a/sql/share/errmsg-utf8.txt
+++ b/sql/share/errmsg-utf8.txt
@@ -7837,13 +7837,13 @@ ER_PARTITION_WRONG_TYPE
         eng "Wrong partition type, expected type: %`s"
 
 WARN_VERS_PART_FULL
-        eng "Using full partition %`s, need more VERSIONING partitions!"
+        eng "Versioned table %`s.%`s: partition %`s is full, add more VERSIONING partitions"
 
 WARN_VERS_PARAMETERS
         eng "Maybe missing parameters: %s"
 
 WARN_VERS_PART_ROTATION
-        eng "Switching from partition %`s to %`s"
+        eng "Versioned table %`s.%`s: switching from partition %`s to %`s"
 
 WARN_VERS_TRX_MISSING
         eng "VTQ missing transaction ID %lu"
@@ -7897,7 +7897,7 @@ ER_PART_WRONG_VALUE
         eng "Wrong parameters for partitioned %`s: wrong value for '%s'"
 
 ER_VERS_WRONG_PARTS
-        eng "Wrong partitions consistency for %`s: must have at least one 'VERSIONING' and exactly one last 'AS OF NOW'"
+        eng "Wrong partitions consistency for %`s: must have at least one VERSIONING and exactly one last AS OF CURRENT_TIMESTAMP"
 
 ER_VERS_HISTORY_LOCK
         eng "Versioned SELECT write-locking of history rows"