This is the 8.0 port of D28735624

Summary:
This diff provides extensible support for specifying query/connection attributes
used as client attributes. Adding a new query attribute name in the future would
not require a server code change, it can be done by changing a system variable,
client_attribute_names.

Reviewed By: george-reynya

Differential Revision: D28775765

fbshipit-source-id: 3a77335e3d3

mysql-test/r/mysqld--help-notwin.result

@@ -305,6 +305,9 @@ The following options may be given as the first argument:
  proxy user mapping should be done according to GRANT
  PROXY privilege definition.
  -r, --chroot=name   Chroot mysqld daemon during startup.
+ --client-attribute-names[=name] 
+ List of supported query/connection attributes to use for
+ client_attributes (default: caller,async_id).
  --collation-server=name 
  Set the default collation.
  --column-stats-control=name 
@@ -2668,6 +2671,7 @@ character-set-server utf8mb4
 character-sets-dir MYSQL_CHARSETSDIR/
 check-proxy-users FALSE
 chroot (No default value)
+client-attribute-names caller,async_id
 collation-server utf8mb4_0900_ai_ci
 column-stats-control OFF_HARD
 commit-consensus-error-action ROLLBACK_TRXS_IN_GROUP

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

@@ -21,6 +21,7 @@ d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	92c0acc6261bc
 d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	99914b932bd37a50b983c5e7c90ae93b	{}
 #
 # Verify with query attrs caller = qa_test1
+#   original_caller QA = oc_qa_test1 (not allowed yet)
 #
 select 1;
 1
@@ -31,33 +32,52 @@ d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	28b1c55c76dad
 d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	92c0acc6261bcb114a857e42acb41812	{'async_id' : '12345'}
 d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	99914b932bd37a50b983c5e7c90ae93b	{}
 #
+# Verify with query attrs caller = qa_test1
+#   original_caller QA = oc_qa_test1 (allowed)
+#
+set @saved_client_attribute_names=@@GLOBAL.client_attribute_names;
+set global client_attribute_names='caller,original_caller,async_id';
+select 1;
+1
+1
+select s.digest, s.count_star, c.client_id, c.client_attributes from events_statements_summary_by_all s, client_attributes c where s.client_id = c.client_id and s.digest = 'd1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae' order by s.client_id;
+digest	count_star	client_id	client_attributes
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	28b1c55c76dad7360f14f3d9f1823864	{'caller' : 'qa_test1'}
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	7c15419e499cc3fb461c2f7563d152da	{'caller' : 'qa_test1', 'original_caller' : 'oc_qa_test1'}
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	92c0acc6261bcb114a857e42acb41812	{'async_id' : '12345'}
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	99914b932bd37a50b983c5e7c90ae93b	{}
+#
 # Verify with query attrs caller = qa_test1 and async id = 12345
+#   query attrs original_caller = oc_qa_test1
 #
 select 1;
 1
 1
 select s.digest, s.count_star, c.client_id, c.client_attributes from events_statements_summary_by_all s, client_attributes c where s.client_id = c.client_id and s.digest = 'd1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae' order by s.client_id;
 digest	count_star	client_id	client_attributes
 d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	28b1c55c76dad7360f14f3d9f1823864	{'caller' : 'qa_test1'}
-d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	647e3f32d8d8ab6fff0dda94443bb610	{'caller' : 'qa_test1', 'async_id' : '12345'}
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	70e7785b1e52423f531f3899d707055c	{'caller' : 'qa_test1', 'original_caller' : 'oc_qa_test1', 'async_id' : '12345'}
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	7c15419e499cc3fb461c2f7563d152da	{'caller' : 'qa_test1', 'original_caller' : 'oc_qa_test1'}
 d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	92c0acc6261bcb114a857e42acb41812	{'async_id' : '12345'}
 d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	99914b932bd37a50b983c5e7c90ae93b	{}
 create user user@localhost identified by 'su';
 grant all on *.* to user@localhost with grant option;
 use performance_schema;
 #
 # Verify with conn attrs caller = ca_test2 and async_id = 56789
+#  and original_caller CA = oc_ca_test2
 #
 select 1;
 1
 1
 select s.digest, s.count_star, c.client_id, c.client_attributes from events_statements_summary_by_all s, client_attributes c where s.client_id = c.client_id and s.digest = 'd1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae' order by s.client_id;
 digest	count_star	client_id	client_attributes
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	23af960d50f4082d1693fec287ca38d5	{'caller' : 'ca_test2', 'original_caller' : 'oc_ca_test2', 'async_id' : '56789'}
 d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	28b1c55c76dad7360f14f3d9f1823864	{'caller' : 'qa_test1'}
-d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	647e3f32d8d8ab6fff0dda94443bb610	{'caller' : 'qa_test1', 'async_id' : '12345'}
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	70e7785b1e52423f531f3899d707055c	{'caller' : 'qa_test1', 'original_caller' : 'oc_qa_test1', 'async_id' : '12345'}
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	7c15419e499cc3fb461c2f7563d152da	{'caller' : 'qa_test1', 'original_caller' : 'oc_qa_test1'}
 d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	92c0acc6261bcb114a857e42acb41812	{'async_id' : '12345'}
 d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	99914b932bd37a50b983c5e7c90ae93b	{}
-d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	d1226657f4c383150755d71bb4251f55	{'caller' : 'ca_test2', 'async_id' : '56789'}
 #
 # Verify with query attrs overriding async_id = 12345
 #
@@ -66,12 +86,13 @@ select 1;
 1
 select s.digest, s.count_star, c.client_id, c.client_attributes from events_statements_summary_by_all s, client_attributes c where s.client_id = c.client_id and s.digest = 'd1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae' order by s.client_id;
 digest	count_star	client_id	client_attributes
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	23af960d50f4082d1693fec287ca38d5	{'caller' : 'ca_test2', 'original_caller' : 'oc_ca_test2', 'async_id' : '56789'}
 d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	28b1c55c76dad7360f14f3d9f1823864	{'caller' : 'qa_test1'}
-d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	2de7f57d90f10431496a2001ca164d6e	{'caller' : 'ca_test2', 'async_id' : '12345'}
-d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	647e3f32d8d8ab6fff0dda94443bb610	{'caller' : 'qa_test1', 'async_id' : '12345'}
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	3b5d439992eb9afdf758682481730bf7	{'caller' : 'ca_test2', 'original_caller' : 'oc_ca_test2', 'async_id' : '12345'}
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	70e7785b1e52423f531f3899d707055c	{'caller' : 'qa_test1', 'original_caller' : 'oc_qa_test1', 'async_id' : '12345'}
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	7c15419e499cc3fb461c2f7563d152da	{'caller' : 'qa_test1', 'original_caller' : 'oc_qa_test1'}
 d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	92c0acc6261bcb114a857e42acb41812	{'async_id' : '12345'}
 d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	99914b932bd37a50b983c5e7c90ae93b	{}
-d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	d1226657f4c383150755d71bb4251f55	{'caller' : 'ca_test2', 'async_id' : '56789'}
 #
 # Verify with query attrs overriding caller = qa_test3
 #
@@ -80,13 +101,31 @@ select 1;
 1
 select s.digest, s.count_star, c.client_id, c.client_attributes from events_statements_summary_by_all s, client_attributes c where s.client_id = c.client_id and s.digest = 'd1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae' order by s.client_id;
 digest	count_star	client_id	client_attributes
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	23af960d50f4082d1693fec287ca38d5	{'caller' : 'ca_test2', 'original_caller' : 'oc_ca_test2', 'async_id' : '56789'}
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	28b1c55c76dad7360f14f3d9f1823864	{'caller' : 'qa_test1'}
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	3b5d439992eb9afdf758682481730bf7	{'caller' : 'ca_test2', 'original_caller' : 'oc_ca_test2', 'async_id' : '12345'}
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	70e7785b1e52423f531f3899d707055c	{'caller' : 'qa_test1', 'original_caller' : 'oc_qa_test1', 'async_id' : '12345'}
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	7c15419e499cc3fb461c2f7563d152da	{'caller' : 'qa_test1', 'original_caller' : 'oc_qa_test1'}
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	92c0acc6261bcb114a857e42acb41812	{'async_id' : '12345'}
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	99914b932bd37a50b983c5e7c90ae93b	{}
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	e0e39521171bfe83b6d120922ecbdec7	{'caller' : 'qa_test3', 'original_caller' : 'oc_ca_test2', 'async_id' : '56789'}
+#
+# Verify with query attrs overriding original caller = oc_qa_test3
+#
+select 1;
+1
+1
+select s.digest, s.count_star, c.client_id, c.client_attributes from events_statements_summary_by_all s, client_attributes c where s.client_id = c.client_id and s.digest = 'd1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae' order by s.client_id;
+digest	count_star	client_id	client_attributes
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	00ba20da7a5e884afeebf2b1537ddf1e	{'caller' : 'ca_test2', 'original_caller' : 'oc_qa_test3', 'async_id' : '56789'}
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	23af960d50f4082d1693fec287ca38d5	{'caller' : 'ca_test2', 'original_caller' : 'oc_ca_test2', 'async_id' : '56789'}
 d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	28b1c55c76dad7360f14f3d9f1823864	{'caller' : 'qa_test1'}
-d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	2de7f57d90f10431496a2001ca164d6e	{'caller' : 'ca_test2', 'async_id' : '12345'}
-d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	5c25d07da9d036c157b55e9ce8c564c7	{'caller' : 'qa_test3', 'async_id' : '56789'}
-d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	647e3f32d8d8ab6fff0dda94443bb610	{'caller' : 'qa_test1', 'async_id' : '12345'}
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	3b5d439992eb9afdf758682481730bf7	{'caller' : 'ca_test2', 'original_caller' : 'oc_ca_test2', 'async_id' : '12345'}
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	70e7785b1e52423f531f3899d707055c	{'caller' : 'qa_test1', 'original_caller' : 'oc_qa_test1', 'async_id' : '12345'}
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	7c15419e499cc3fb461c2f7563d152da	{'caller' : 'qa_test1', 'original_caller' : 'oc_qa_test1'}
 d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	92c0acc6261bcb114a857e42acb41812	{'async_id' : '12345'}
 d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	99914b932bd37a50b983c5e7c90ae93b	{}
-d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	d1226657f4c383150755d71bb4251f55	{'caller' : 'ca_test2', 'async_id' : '56789'}
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	e0e39521171bfe83b6d120922ecbdec7	{'caller' : 'qa_test3', 'original_caller' : 'oc_ca_test2', 'async_id' : '56789'}
 #
 # Verify with just conn attrs again
 #
@@ -95,13 +134,15 @@ select 1;
 1
 select s.digest, s.count_star, c.client_id, c.client_attributes from events_statements_summary_by_all s, client_attributes c where s.client_id = c.client_id and s.digest = 'd1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae' order by s.client_id;
 digest	count_star	client_id	client_attributes
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	00ba20da7a5e884afeebf2b1537ddf1e	{'caller' : 'ca_test2', 'original_caller' : 'oc_qa_test3', 'async_id' : '56789'}
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	2	23af960d50f4082d1693fec287ca38d5	{'caller' : 'ca_test2', 'original_caller' : 'oc_ca_test2', 'async_id' : '56789'}
 d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	28b1c55c76dad7360f14f3d9f1823864	{'caller' : 'qa_test1'}
-d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	2de7f57d90f10431496a2001ca164d6e	{'caller' : 'ca_test2', 'async_id' : '12345'}
-d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	5c25d07da9d036c157b55e9ce8c564c7	{'caller' : 'qa_test3', 'async_id' : '56789'}
-d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	647e3f32d8d8ab6fff0dda94443bb610	{'caller' : 'qa_test1', 'async_id' : '12345'}
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	3b5d439992eb9afdf758682481730bf7	{'caller' : 'ca_test2', 'original_caller' : 'oc_ca_test2', 'async_id' : '12345'}
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	70e7785b1e52423f531f3899d707055c	{'caller' : 'qa_test1', 'original_caller' : 'oc_qa_test1', 'async_id' : '12345'}
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	7c15419e499cc3fb461c2f7563d152da	{'caller' : 'qa_test1', 'original_caller' : 'oc_qa_test1'}
 d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	92c0acc6261bcb114a857e42acb41812	{'async_id' : '12345'}
 d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	99914b932bd37a50b983c5e7c90ae93b	{}
-d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	2	d1226657f4c383150755d71bb4251f55	{'caller' : 'ca_test2', 'async_id' : '56789'}
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	e0e39521171bfe83b6d120922ecbdec7	{'caller' : 'qa_test3', 'original_caller' : 'oc_ca_test2', 'async_id' : '56789'}
 use performance_schema;
 truncate table client_attributes;
 select * from client_attributes;
@@ -118,7 +159,8 @@ select 1; select 2;
 2
 select s.digest, s.count_star, c.client_id, c.client_attributes from events_statements_summary_by_all s, client_attributes c where s.client_id = c.client_id and s.digest = 'd1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae' order by s.client_id;
 digest	count_star	client_id	client_attributes
-d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	2	16d36a0c20053a85f98470b2ab3e061f	{'caller' : 'qa_multiquery'}
 d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	1	99914b932bd37a50b983c5e7c90ae93b	{}
+d1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae	2	c7e8290cc1f481a21ff284f6ed08a538	{'caller' : 'qa_multiquery', 'original_caller' : 'oc_multiquery'}
+set global client_attribute_names=@saved_client_attribute_names;
 drop user user@localhost;
 set global performance_schema_esms_by_all = DEFAULT;

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

@@ -20,15 +20,28 @@ select s.digest, s.count_star, c.client_id, c.client_attributes from events_stat
 
 --echo #
 --echo # Verify with query attrs caller = qa_test1
+--echo #   original_caller QA = oc_qa_test1 (not allowed yet)
 --echo #
 query_attrs_reset;
 query_attrs_add caller qa_test1;
+query_attrs_add original_caller oc_qa_test1;
+select 1;
+
+select s.digest, s.count_star, c.client_id, c.client_attributes from events_statements_summary_by_all s, client_attributes c where s.client_id = c.client_id and s.digest = 'd1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae' order by s.client_id;
+
+--echo #
+--echo # Verify with query attrs caller = qa_test1
+--echo #   original_caller QA = oc_qa_test1 (allowed)
+--echo #
+set @saved_client_attribute_names=@@GLOBAL.client_attribute_names;
+set global client_attribute_names='caller,original_caller,async_id';
 select 1;
 
 select s.digest, s.count_star, c.client_id, c.client_attributes from events_statements_summary_by_all s, client_attributes c where s.client_id = c.client_id and s.digest = 'd1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae' order by s.client_id;
 
 --echo #
 --echo # Verify with query attrs caller = qa_test1 and async id = 12345
+--echo #   query attrs original_caller = oc_qa_test1
 --echo #
 query_attrs_add async_id 12345;
 select 1;
@@ -41,13 +54,15 @@ grant all on *.* to user@localhost with grant option;
 
 connect (con1, localhost, user, su, test);
 conn_attrs_add caller ca_test2;
+conn_attrs_add original_caller oc_ca_test2;
 conn_attrs_add async_id 56789;
 # change_user is needed just to set the correct connection attributes.
 change_user user,su,test;
 use performance_schema;
 
 --echo #
 --echo # Verify with conn attrs caller = ca_test2 and async_id = 56789
+--echo #  and original_caller CA = oc_ca_test2
 --echo #
 select 1;
 
@@ -70,6 +85,15 @@ select 1;
 
 select s.digest, s.count_star, c.client_id, c.client_attributes from events_statements_summary_by_all s, client_attributes c where s.client_id = c.client_id and s.digest = 'd1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae' order by s.client_id;
 
+--echo #
+--echo # Verify with query attrs overriding original caller = oc_qa_test3
+--echo #
+query_attrs_reset;
+query_attrs_add original_caller oc_qa_test3;
+select 1;
+
+select s.digest, s.count_star, c.client_id, c.client_attributes from events_statements_summary_by_all s, client_attributes c where s.client_id = c.client_id and s.digest = 'd1b44b0c19af710b5a679907e284acd2ddc285201794bc69a2389d77baedddae' order by s.client_id;
+
 
 --echo #
 --echo # Verify with just conn attrs again
@@ -93,6 +117,7 @@ select * from client_attributes;
 --echo # Test multiquery cases
 --echo #
 query_attrs_add caller qa_multiquery;
+query_attrs_add original_caller oc_multiquery;
 delimiter ||||;
  select 1; select 2;
 ||||
@@ -103,6 +128,7 @@ select s.digest, s.count_star, c.client_id, c.client_attributes from events_stat
 connection default;
 
 # Cleanup
+set global client_attribute_names=@saved_client_attribute_names;
 conn_attrs_reset;
 query_attrs_reset;
 drop user user@localhost;

mysql-test/suite/sys_vars/r/client_attribute_names_basic.result

@@ -0,0 +1,35 @@
+Default value of client_attribute_names is caller,async_id
+SELECT @@global.client_attribute_names;
+@@global.client_attribute_names
+caller,async_id
+SELECT @@session.client_attribute_names;
+ERROR HY000: Variable 'client_attribute_names' is a GLOBAL variable
+Expected error 'Variable is a GLOBAL variable'
+client_attribute_names is a dynamic variable (change to a valid value)
+set @@global.client_attribute_names = 'caller,original_caller,async_id';
+SELECT @@global.client_attribute_names;
+@@global.client_attribute_names
+caller,original_caller,async_id
+set @@global.client_attribute_names = 'caller,original_caller';
+SELECT @@global.client_attribute_names;
+@@global.client_attribute_names
+caller,original_caller
+set @@global.client_attribute_names = 'original_caller,async_id';
+SELECT @@global.client_attribute_names;
+@@global.client_attribute_names
+original_caller,async_id
+restore the default value
+SET @@global.client_attribute_names = 'caller,async_id';
+SELECT @@global.client_attribute_names;
+@@global.client_attribute_names
+caller,async_id
+restart the server with non default value (caller,original_caller)
+# restart: --client_attribute_names=caller,original_caller
+SELECT @@global.client_attribute_names;
+@@global.client_attribute_names
+caller,original_caller
+restart the server with the default value (caller,async_id)
+# restart:
+SELECT @@global.client_attribute_names;
+@@global.client_attribute_names
+caller,async_id

mysql-test/suite/sys_vars/r/sql_findings_control_basic.result

@@ -16,12 +16,12 @@ SELECT @@global.sql_findings_control;
 @@global.sql_findings_control
 OFF_HARD
 restart the server with non default value (OFF_SOFT)
-# restart
+# restart: --sql_findings_control=off_soft
 SELECT @@global.sql_findings_control;
 @@global.sql_findings_control
-OFF_HARD
+OFF_SOFT
 restart the server with the default value (OFF_HARD)
-# restart
+# restart:
 SELECT @@global.sql_findings_control;
 @@global.sql_findings_control
 OFF_HARD

mysql-test/suite/sys_vars/r/sql_maximum_duplicate_executions_basic.result

@@ -16,12 +16,12 @@ SELECT @@global.sql_maximum_duplicate_executions;
 @@global.sql_maximum_duplicate_executions
 0
 restart the server with non default value (5)
-# restart
+# restart: --sql_maximum_duplicate_executions=5
 SELECT @@global.sql_maximum_duplicate_executions;
 @@global.sql_maximum_duplicate_executions
-0
+5
 restart the server with the default value (0)
-# restart
+# restart:
 SELECT @@global.sql_maximum_duplicate_executions;
 @@global.sql_maximum_duplicate_executions
 0