Bug #27629719: SET PERSIST STORES TRUNCATED TIMESTAMPS

Increased the resolution of the peristed variables timestams to the
maximum allowed.
Increased the delcared resoltion of
performance_schema.variables_info.set_time used to display these.
Added a test to make sure the fractional seconds are operational.
Bumped the pfs version

Author: gkodinov

mysql-test/r/persisted_variables_bugs.result

@@ -136,4 +136,21 @@ innodb_max_dirty_pages_pct = default, init_connect = default,
 max_join_size = default;
 Warnings:
 Warning	1230	Default value is not defined for this set option. Please specify correct counter or module name.
+#
+# Bug #27629719: SET PERSIST STORES TRUNCATED TIMESTAMPS
+#
+# Set one variable in the mysqld-auto.cnf
+SET PERSIST max_join_size= 10000000;
+# Set another variable in the mysqld-auto.cnf
+SET PERSIST init_connect='';
+# Restart the server so it sets the variable time from mysqld-auto.cnf
+# restart
+# Check the microseconds of set_time: must be 2 (i.e. different for the two vars)
+SELECT COUNT(DISTINCT MICROSECOND(set_time)) FROM performance_schema.variables_info
+WHERE variable_name IN ('max_join_size', 'init_connect');
+COUNT(DISTINCT MICROSECOND(set_time))
+2
+# Cleanup
+SET GLOBAL max_join_size=DEFAULT, init_connect=DEFAULT;
+RESET PERSIST;
 # End of the 8.0 tests

mysql-test/r/persisted_variables_extended.result

@@ -261,7 +261,7 @@ variables_info	CREATE TABLE "variables_info" (
   "VARIABLE_PATH" varchar(1024) DEFAULT NULL,
   "MIN_VALUE" varchar(64) DEFAULT NULL,
   "MAX_VALUE" varchar(64) DEFAULT NULL,
-  "SET_TIME" timestamp NULL DEFAULT NULL,
+  "SET_TIME" timestamp(6) NULL DEFAULT NULL,
   "SET_USER" char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   "SET_HOST" char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8

mysql-test/suite/perfschema/r/dd_version_check.result

@@ -1,6 +1,6 @@
 "Checking the data dictionary properties ..."
 SUBSTRING_INDEX(SUBSTRING(properties, LOCATE('PS_VERSION', properties), 30), ';', 1)
-PS_VERSION=80004
+PS_VERSION=80011
 "Checking the performance schema database structure ..."
 CHECK STATUS
-The tables in the performance_schema were last changed in MySQL 8.0.4-rc
+The tables in the performance_schema were last changed in MySQL 8.0.11

mysql-test/suite/perfschema/r/idx_variables_info.result

@@ -6,7 +6,7 @@ variables_info	CREATE TABLE `variables_info` (
   `VARIABLE_PATH` varchar(1024) DEFAULT NULL,
   `MIN_VALUE` varchar(64) DEFAULT NULL,
   `MAX_VALUE` varchar(64) DEFAULT NULL,
-  `SET_TIME` timestamp NULL DEFAULT NULL,
+  `SET_TIME` timestamp(6) NULL DEFAULT NULL,
   `SET_USER` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
   `SET_HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8

mysql-test/suite/perfschema/r/table_schema.result

@@ -1353,7 +1353,7 @@ def	performance_schema	variables_info	VARIABLE_SOURCE	2	COMPILED	YES	enum	12	36
 def	performance_schema	variables_info	VARIABLE_PATH	3	NULL	YES	varchar	1024	3072	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(1024)			select,insert,update,references			NULL
 def	performance_schema	variables_info	MIN_VALUE	4	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references			NULL
 def	performance_schema	variables_info	MAX_VALUE	5	NULL	YES	varchar	64	192	NULL	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references			NULL
-def	performance_schema	variables_info	SET_TIME	6	NULL	YES	timestamp	NULL	NULL	NULL	NULL	0	NULL	NULL	timestamp			select,insert,update,references			NULL
+def	performance_schema	variables_info	SET_TIME	6	NULL	YES	timestamp	NULL	NULL	NULL	NULL	6	NULL	NULL	timestamp(6)			select,insert,update,references			NULL
 def	performance_schema	variables_info	SET_USER	7	NULL	YES	char	32	96	NULL	NULL	NULL	utf8	utf8_bin	char(32)			select,insert,update,references			NULL
 def	performance_schema	variables_info	SET_HOST	8	NULL	YES	char	60	180	NULL	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references			NULL
 select count(*) from information_schema.columns

mysql-test/suite/perfschema/t/dd_version_check.test

@@ -60,8 +60,8 @@ create table test.pfs_published_schema
 #
 
 insert into test.pfs_published_schema
- values("MySQL 8.0.4-rc",
-        "aa77743b47ba8ce22bc3ceaa8136dbc5244f3f37c15f60923bbea0b8317fdbf5");
+ values("MySQL 8.0.11",
+        "b6dd7571b1e0cd932692c8eb00e5d41aa9bfa7d4b38cca0c9a2e2458633f258a");
 
 create table test.pfs_check_table
   (id int(11) NOT NULL AUTO_INCREMENT,

mysql-test/t/persisted_variables_bugs.test

@@ -135,5 +135,26 @@ SET GLOBAL optimizer_trace_offset = default, activate_all_roles_on_login = defau
        innodb_max_dirty_pages_pct = default, init_connect = default,
        max_join_size = default;
 
+--echo #
+--echo # Bug #27629719: SET PERSIST STORES TRUNCATED TIMESTAMPS
+--echo #
+
+--echo # Set one variable in the mysqld-auto.cnf
+SET PERSIST max_join_size= 10000000;
+--echo # Set another variable in the mysqld-auto.cnf
+SET PERSIST init_connect='';
+
+--echo # Restart the server so it sets the variable time from mysqld-auto.cnf
+--source include/restart_mysqld.inc
+
+--echo # Check the microseconds of set_time: must be 2 (i.e. different for the two vars)
+SELECT COUNT(DISTINCT MICROSECOND(set_time)) FROM performance_schema.variables_info
+  WHERE variable_name IN ('max_join_size', 'init_connect');
+
+--echo # Cleanup
+SET GLOBAL max_join_size=DEFAULT, init_connect=DEFAULT;
+RESET PERSIST;
+
+
 --echo # End of the 8.0 tests
 

sql/persisted_variable.cc

@@ -158,14 +158,14 @@ Persisted_variables_cache *Persisted_variables_cache::m_instance = NULL;
 
 st_persist_var::st_persist_var() {
   if (current_thd) {
-    timeval tv = current_thd->query_start_timeval_trunc(0);
+    timeval tv = current_thd->query_start_timeval_trunc(DATETIME_MAX_DECIMALS);
     timestamp = tv.tv_sec * 1000000ULL + tv.tv_usec;
   } else
     timestamp = my_micro_time();
 }
 
 st_persist_var::st_persist_var(THD *thd) {
-  timeval tv = thd->query_start_timeval_trunc(0);
+  timeval tv = thd->query_start_timeval_trunc(DATETIME_MAX_DECIMALS);
   timestamp = tv.tv_sec * 1000000ULL + tv.tv_usec;
   user = thd->security_context()->user().str;
   host = thd->security_context()->host().str;

storage/perfschema/pfs_dd_version.h

@@ -67,7 +67,26 @@
   - metadata_locks (modified, added column COLUMN_NAME)
   - replication_connection_configuration (modified)
   - instance_log_resource (created)
+
+  80005:
+
+  performance_schema tables changed in MySQL 8.0.5 are
+  - all, changed UTF8 (aka UTF8MB3) to UTF8MB4.
+
+  80006:
+
+  performance_schema tables changed in MySQL 8.0.6 are
+  - variables_info.set_time precision changed from 0 to 6.
+
+  80011:
+
+  Reverted UTF8MB4 changes.
+  Version bump from 8.0.6 to 8.0.11,
+  versions [8.0.5 - 8.0.10] inclusive are abandoned.
+
+  Version published is now 80011.
+
 */
-static const uint PFS_DD_VERSION = 80004;
+static const uint PFS_DD_VERSION = 80011;
 
 #endif /* PFS_DD_VERSION_H */

storage/perfschema/table_variables_info.cc

@@ -58,7 +58,7 @@ Plugin_table table_variables_info::m_table_def(
     "  VARIABLE_PATH varchar(1024),\n"
     "  MIN_VALUE varchar(64),\n"
     "  MAX_VALUE varchar(64),\n"
-    "  SET_TIME TIMESTAMP(0) default null,\n"
+    "  SET_TIME TIMESTAMP(6) default null,\n"
     "  SET_USER CHAR(32) collate utf8_bin default null,\n"
     "  SET_HOST CHAR(60) collate utf8_bin default null\n",
     /* Options */