Merge branch 'mysql-8.0' into mysql-trunk

Author: marcalff

include/mysql/components/services/pfs_plugin_table_service.h

@@ -777,14 +777,32 @@ DECLARE_METHOD(void, get, (PSI_field * f, char *val, unsigned int *len));
 /* No support for indexes. */
 END_SERVICE_DEFINITION(pfs_plugin_column_datetime_v1)
 
+/*
+  SERVICE_DEFINITION(pfs_plugin_column_timestamp_v1)
+  Introduced in MySQL 8.0.14
+  Deprecated in MySQL 8.0.17
+  Status: Deprecated, use version 2 instead.
+*/
 BEGIN_SERVICE_DEFINITION(pfs_plugin_column_timestamp_v1)
+DECLARE_METHOD(void, set,
+               (PSI_field * f, const char *str, unsigned int length));
+DECLARE_METHOD(void, get, (PSI_field * f, char *val, unsigned int *len));
+/* No support for indexes. */
+END_SERVICE_DEFINITION(pfs_plugin_column_timestamp_v1)
+
+/*
+  SERVICE_DEFINITION(pfs_plugin_column_timestamp_v2)
+  Introduced in MySQL 8.0.17
+  Status: Active.
+*/
+BEGIN_SERVICE_DEFINITION(pfs_plugin_column_timestamp_v2)
 DECLARE_METHOD(void, set,
                (PSI_field * f, const char *str, unsigned int length));
 /* Set time stamp value in microseconds as returned by my_micro_time(). */
 DECLARE_METHOD(void, set2, (PSI_field * f, unsigned long long val));
 DECLARE_METHOD(void, get, (PSI_field * f, char *val, unsigned int *len));
 /* No support for indexes. */
-END_SERVICE_DEFINITION(pfs_plugin_column_timestamp_v1)
+END_SERVICE_DEFINITION(pfs_plugin_column_timestamp_v2)
 
 BEGIN_SERVICE_DEFINITION(pfs_plugin_column_year_v1)
 DECLARE_METHOD(void, set, (PSI_field * f, PSI_year value));

plugin/clone/src/clone_status.cc

@@ -40,7 +40,7 @@ SERVICE_TYPE_NO_CONST(pfs_plugin_column_bigint_v1) *mysql_pfscol_bigint =
     nullptr;
 SERVICE_TYPE_NO_CONST(pfs_plugin_column_string_v1) *mysql_pfscol_string =
     nullptr;
-SERVICE_TYPE_NO_CONST(pfs_plugin_column_timestamp_v1) *mysql_pfscol_timestamp =
+SERVICE_TYPE_NO_CONST(pfs_plugin_column_timestamp_v2) *mysql_pfscol_timestamp =
     nullptr;
 
 #define FILE_PREFIX "#"
@@ -136,7 +136,7 @@ bool Table_pfs::acquire_services() {
   ACQUIRE_SERVICE(mysql_pfscol_int, "pfs_plugin_column_integer_v1")
   ACQUIRE_SERVICE(mysql_pfscol_bigint, "pfs_plugin_column_bigint_v1")
   ACQUIRE_SERVICE(mysql_pfscol_string, "pfs_plugin_column_string_v1")
-  ACQUIRE_SERVICE(mysql_pfscol_timestamp, "pfs_plugin_column_timestamp_v1")
+  ACQUIRE_SERVICE(mysql_pfscol_timestamp, "pfs_plugin_column_timestamp_v2")
 
   auto err = create_proxy_tables();
   if (err != 0) {

storage/perfschema/pfs.cc

@@ -8547,7 +8547,9 @@ PROVIDES_SERVICE(performance_schema, psi_cond_v1),
     PROVIDES_SERVICE(performance_schema, pfs_plugin_column_date_v1),
     PROVIDES_SERVICE(performance_schema, pfs_plugin_column_time_v1),
     PROVIDES_SERVICE(performance_schema, pfs_plugin_column_datetime_v1),
+    /* Deprecated, use pfs_plugin_column_timestamp_v2. */
     PROVIDES_SERVICE(performance_schema, pfs_plugin_column_timestamp_v1),
+    PROVIDES_SERVICE(performance_schema, pfs_plugin_column_timestamp_v2),
     PROVIDES_SERVICE(performance_schema, pfs_plugin_column_year_v1),
     END_COMPONENT_PROVIDES();
 

storage/perfschema/pfs_plugin_table.cc

@@ -1452,6 +1452,10 @@ BEGIN_SERVICE_IMPLEMENTATION(performance_schema, pfs_plugin_column_datetime_v1)
 END_SERVICE_IMPLEMENTATION();
 
 BEGIN_SERVICE_IMPLEMENTATION(performance_schema, pfs_plugin_column_timestamp_v1)
+    set_field_timestamp_v1, get_field_timestamp_v1
+END_SERVICE_IMPLEMENTATION();
+
+BEGIN_SERVICE_IMPLEMENTATION(performance_schema, pfs_plugin_column_timestamp_v2)
     set_field_timestamp_v1, set_field_timestamp2_v1, get_field_timestamp_v1
 END_SERVICE_IMPLEMENTATION();
 

storage/perfschema/pfs_plugin_table.h

@@ -82,6 +82,9 @@ extern SERVICE_TYPE(pfs_plugin_column_datetime_v1)
 extern SERVICE_TYPE(pfs_plugin_column_timestamp_v1)
     SERVICE_IMPLEMENTATION(performance_schema, pfs_plugin_column_timestamp_v1);
 
+extern SERVICE_TYPE(pfs_plugin_column_timestamp_v2)
+    SERVICE_IMPLEMENTATION(performance_schema, pfs_plugin_column_timestamp_v2);
+
 extern SERVICE_TYPE(pfs_plugin_column_year_v1)
     SERVICE_IMPLEMENTATION(performance_schema, pfs_plugin_column_year_v1);
 

storage/perfschema/unittest/stub_pfs_plugin_table.h

@@ -98,6 +98,10 @@ SERVICE_IMPLEMENTATION(performance_schema, pfs_plugin_column_datetime_v1){NULL,
 
 SERVICE_TYPE(pfs_plugin_column_timestamp_v1)
 SERVICE_IMPLEMENTATION(performance_schema, pfs_plugin_column_timestamp_v1){
+    NULL, NULL};
+
+SERVICE_TYPE(pfs_plugin_column_timestamp_v2)
+SERVICE_IMPLEMENTATION(performance_schema, pfs_plugin_column_timestamp_v2){
     NULL, NULL, NULL};
 
 SERVICE_TYPE(pfs_plugin_column_year_v1)