WL#12086: cryptographically signed SET statements.

Author: gkodinov

include/map_helpers.h

@@ -1,4 +1,4 @@
-/* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2017, 2018, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License, version 2.0,
@@ -274,6 +274,12 @@ class collation_unordered_set
                            Malloc_allocator<Key>>(
             /*bucket_count=*/10, Collation_hasher(cs), Collation_key_equal(cs),
             Malloc_allocator<>(psi_key)) {}
+  collation_unordered_set(std::initializer_list<Key> il, CHARSET_INFO *cs,
+                          PSI_memory_key psi_key)
+      : std::unordered_set<Key, Collation_hasher, Collation_key_equal,
+                           Malloc_allocator<Key>>(
+            il, /*bucket_count=*/10, Collation_hasher(cs),
+            Collation_key_equal(cs), Malloc_allocator<>(psi_key)) {}
 };
 
 /** std::unordered_set, but allocated on a MEM_ROOT.  */

mysql-test/r/all_persisted_variables.result

@@ -42,17 +42,17 @@ include/assert.inc ['Expect 554 variables in the table. Due to open Bugs, we are
 
 # Test SET PERSIST
 
-include/assert.inc [Expect 361 persisted variables in the table. Due to open Bugs, we are checking for 356]
+include/assert.inc [Expect 359 persisted variables in the table. Due to open Bugs, we are checking for 354]
 
 ************************************************************
 * 3. Restart server, it must preserve the persisted variable
 *    settings. Verify persisted configuration.
 ************************************************************
 # restart
 
-include/assert.inc [Expect 356 persisted variables in persisted_variables table.]
-include/assert.inc [Expect 356 persisted variables shown as PERSISTED in variables_info table.]
-include/assert.inc [Expect 356 persisted variables with matching peristed and global values.]
+include/assert.inc [Expect 354 persisted variables in persisted_variables table.]
+include/assert.inc [Expect 354 persisted variables shown as PERSISTED in variables_info table.]
+include/assert.inc [Expect 354 persisted variables with matching peristed and global values.]
 
 ************************************************************
 * 4. Test RESET PERSIST IF EXISTS. Verify persisted variable

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

@@ -897,6 +897,9 @@ The following options may be given as the first argument:
  --performance-schema-users-size=# 
  Maximum number of instrumented users. Use 0 to disable,
  -1 for automated scaling.
+ --persist-only-admin-x509-subject[=name] 
+ The client peer certificate name required to enable
+ setting all system variables via SET PERSIST[_ONLY]
  --persisted-globals-load 
  When this option is enabled, config file mysqld-auto.cnf
  is read and applied to server, else this file is ignored
@@ -1568,6 +1571,7 @@ performance-schema-session-connect-attrs-size -1
 performance-schema-setup-actors-size -1
 performance-schema-setup-objects-size -1
 performance-schema-users-size -1
+persist-only-admin-x509-subject 
 persisted-globals-load TRUE
 port ####
 port-open-timeout 0

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

@@ -897,6 +897,9 @@ The following options may be given as the first argument:
  --performance-schema-users-size=# 
  Maximum number of instrumented users. Use 0 to disable,
  -1 for automated scaling.
+ --persist-only-admin-x509-subject[=name] 
+ The client peer certificate name required to enable
+ setting all system variables via SET PERSIST[_ONLY]
  --persisted-globals-load 
  When this option is enabled, config file mysqld-auto.cnf
  is read and applied to server, else this file is ignored
@@ -1576,6 +1579,7 @@ performance-schema-session-connect-attrs-size -1
 performance-schema-setup-actors-size -1
 performance-schema-setup-objects-size -1
 performance-schema-users-size -1
+persist-only-admin-x509-subject 
 persisted-globals-load TRUE
 port ####
 port-open-timeout 0

mysql-test/r/persisted_variables_bugs.result

@@ -243,12 +243,8 @@ RESET PERSIST;
 SET PERSIST mandatory_roles= default;
 # Restart server and check if server starts
 # restart
-SET PERSIST keyring_operations= default;
-# Restart server and check if server starts
-# restart
 SELECT * FROM performance_schema.persisted_variables ORDER BY 1;
 VARIABLE_NAME	VARIABLE_VALUE
-keyring_operations	ON
 mandatory_roles	
 RESET PERSIST;
 #

mysql-test/suite/binlog_nogtid/r/binlog_persist_only_variables.result

@@ -63,6 +63,7 @@ SET PERSIST_ONLY log_bin_index = @@GLOBAL.log_bin_index;
 ERROR HY000: Variable 'log_bin_index' is a non persistent read only variable
 SET PERSIST_ONLY log_bin_trust_function_creators = @@GLOBAL.log_bin_trust_function_creators;
 SET PERSIST_ONLY log_bin_use_v1_row_events = @@GLOBAL.log_bin_use_v1_row_events;
+ERROR HY000: Variable 'log_bin_use_v1_row_events' is a non persistent variable
 SET PERSIST_ONLY log_slave_updates = @@GLOBAL.log_slave_updates;
 SET PERSIST_ONLY log_slow_slave_statements = @@GLOBAL.log_slow_slave_statements;
 SET PERSIST_ONLY log_statements_unsafe_for_binlog = @@GLOBAL.log_statements_unsafe_for_binlog;
@@ -119,16 +120,16 @@ SET PERSIST_ONLY sync_master_info = @@GLOBAL.sync_master_info;
 SET PERSIST_ONLY sync_relay_log = @@GLOBAL.sync_relay_log;
 SET PERSIST_ONLY sync_relay_log_info = @@GLOBAL.sync_relay_log_info;
 
-include/assert.inc ['Expect 70 persisted variables in persisted_variables table.']
+include/assert.inc ['Expect 69 persisted variables in persisted_variables table.']
 
 ############################################################
 # 2. Restart server, it must preserve the persisted variable
 #    settings. Verify persisted configuration.
 # restart
 
-include/assert.inc ['Expect 70 persisted variables in persisted_variables table.']
-include/assert.inc ['Expect 70 persisted variables shown as PERSISTED in variables_info table.']
-include/assert.inc ['Expect 70 persisted variables with matching peristed and global values.']
+include/assert.inc ['Expect 69 persisted variables in persisted_variables table.']
+include/assert.inc ['Expect 69 persisted variables shown as PERSISTED in variables_info table.']
+include/assert.inc ['Expect 69 persisted variables with matching peristed and global values.']
 
 ############################################################
 # 3. Test RESET PERSIST. Verify persisted variable settings
@@ -168,6 +169,7 @@ RESET PERSIST log_bin_index;
 ERROR HY000: Variable log_bin_index does not exist in persisted config file
 RESET PERSIST log_bin_trust_function_creators;
 RESET PERSIST log_bin_use_v1_row_events;
+ERROR HY000: Variable log_bin_use_v1_row_events does not exist in persisted config file
 RESET PERSIST log_slave_updates;
 RESET PERSIST log_slow_slave_statements;
 RESET PERSIST log_statements_unsafe_for_binlog;

mysql-test/suite/binlog_nogtid/r/binlog_persist_variables.result

@@ -64,6 +64,7 @@ SET PERSIST log_bin_index = @@GLOBAL.log_bin_index;
 ERROR HY000: Variable 'log_bin_index' is a read only variable
 SET PERSIST log_bin_trust_function_creators = @@GLOBAL.log_bin_trust_function_creators;
 SET PERSIST log_bin_use_v1_row_events = @@GLOBAL.log_bin_use_v1_row_events;
+ERROR HY000: Variable 'log_bin_use_v1_row_events' is a non persistent variable
 SET PERSIST log_slave_updates = @@GLOBAL.log_slave_updates;
 ERROR HY000: Variable 'log_slave_updates' is a read only variable
 SET PERSIST log_slow_slave_statements = @@GLOBAL.log_slow_slave_statements;
@@ -124,16 +125,16 @@ SET PERSIST sync_master_info = @@GLOBAL.sync_master_info;
 SET PERSIST sync_relay_log = @@GLOBAL.sync_relay_log;
 SET PERSIST sync_relay_log_info = @@GLOBAL.sync_relay_log_info;
 
-include/assert.inc ['Expect 65 persisted variables in persisted_variables table.']
+include/assert.inc ['Expect 64 persisted variables in persisted_variables table.']
 
 ############################################################
 # 2. Restart server, it must preserve the persisted variable
 #    settings. Verify persisted configuration.
 # restart
 
-include/assert.inc ['Expect 65 persisted variables in persisted_variables table.']
-include/assert.inc ['Expect 65 persisted variables shown as PERSISTED in variables_info table.']
-include/assert.inc ['Expect 65 persisted variables with matching peristed and global values.']
+include/assert.inc ['Expect 64 persisted variables in persisted_variables table.']
+include/assert.inc ['Expect 64 persisted variables shown as PERSISTED in variables_info table.']
+include/assert.inc ['Expect 64 persisted variables with matching peristed and global values.']
 
 ############################################################
 # 3. Test RESET PERSIST IF EXISTS. Verify persisted variable
@@ -180,6 +181,8 @@ Warnings:
 Warning	3615	Variable log_bin_index does not exist in persisted config file
 RESET PERSIST IF EXISTS log_bin_trust_function_creators;
 RESET PERSIST IF EXISTS log_bin_use_v1_row_events;
+Warnings:
+Warning	3615	Variable log_bin_use_v1_row_events does not exist in persisted config file
 RESET PERSIST IF EXISTS log_slave_updates;
 Warnings:
 Warning	3615	Variable log_slave_updates does not exist in persisted config file

mysql-test/suite/binlog_nogtid/t/binlog_persist_only_variables.test

@@ -69,14 +69,14 @@ while ( $varid <= $countvars )
   --let $varnames= `SELECT varname FROM rplvars WHERE id=$varid`
 
   # Following variables are non persistent read only variables.
-  if (`SELECT '$varnames' IN ('gtid_executed', 'gtid_owned', 'log_bin', 'log_bin_basename', 'log_bin_index', 'relay_log', 'relay_log_basename', 'relay_log_index', 'relay_log_info_file', 'slave_load_tmpdir')`)
+  if (`SELECT '$varnames' IN ('gtid_executed', 'gtid_owned', 'log_bin', 'log_bin_basename', 'log_bin_index', 'relay_log', 'relay_log_basename', 'relay_log_index', 'relay_log_info_file', 'slave_load_tmpdir', 'log_bin_use_v1_row_events')`)
   {
     --error ER_INCORRECT_GLOBAL_LOCAL_VAR
   }
   --eval SET PERSIST_ONLY $varnames = @@GLOBAL.$varnames
 
   #  TODO: Remove/update this once Bug#27322592 is FIXED.
-  if (`SELECT '$varnames' IN ('binlog_direct_non_transactional_updates', 'binlog_order_commits', 'binlog_rows_query_log_events', 'log_bin_trust_function_creators', 'log_bin_use_v1_row_events', 'log_slow_slave_statements', 'log_statements_unsafe_for_binlog', 'master_verify_checksum', 'slave_allow_batching', 'slave_compressed_protocol', 'slave_preserve_commit_order', 'slave_sql_verify_checksum', 'relay_log_purge', 'rpl_semi_sync_master_enabled', 'rpl_semi_sync_master_wait_no_slave', 'rpl_semi_sync_slave_enabled', 'binlog_gtid_simple_recovery', 'log_slave_updates', 'relay_log_recovery')`)
+  if (`SELECT '$varnames' IN ('binlog_direct_non_transactional_updates', 'binlog_order_commits', 'binlog_rows_query_log_events', 'log_bin_trust_function_creators', 'log_slow_slave_statements', 'log_statements_unsafe_for_binlog', 'master_verify_checksum', 'slave_allow_batching', 'slave_compressed_protocol', 'slave_preserve_commit_order', 'slave_sql_verify_checksum', 'relay_log_purge', 'rpl_semi_sync_master_enabled', 'rpl_semi_sync_master_wait_no_slave', 'rpl_semi_sync_slave_enabled', 'binlog_gtid_simple_recovery', 'log_slave_updates', 'relay_log_recovery')`)
   {
     --disable_query_log
       --eval SELECT varvalue INTO @varvalues FROM rplvars WHERE id=$varid
@@ -88,8 +88,8 @@ while ( $varid <= $countvars )
 }
 
 --echo
---let $assert_text= 'Expect 70 persisted variables in persisted_variables table.'
---let $assert_cond= [SELECT COUNT(*) as count FROM performance_schema.persisted_variables, count, 1] = 70
+--let $assert_text= 'Expect 69 persisted variables in persisted_variables table.'
+--let $assert_cond= [SELECT COUNT(*) as count FROM performance_schema.persisted_variables, count, 1] = 69
 --source include/assert.inc
 
 
@@ -101,16 +101,16 @@ while ( $varid <= $countvars )
 --source include/wait_until_connected_again.inc
 
 --echo
---let $assert_text= 'Expect 70 persisted variables in persisted_variables table.'
---let $assert_cond= [SELECT COUNT(*) as count FROM performance_schema.persisted_variables, count, 1] = 70
+--let $assert_text= 'Expect 69 persisted variables in persisted_variables table.'
+--let $assert_cond= [SELECT COUNT(*) as count FROM performance_schema.persisted_variables, count, 1] = 69
 --source include/assert.inc
 
---let $assert_text= 'Expect 70 persisted variables shown as PERSISTED in variables_info table.'
---let $assert_cond= [SELECT COUNT(*) as count FROM performance_schema.variables_info WHERE variable_source="PERSISTED", count, 1] = 70
+--let $assert_text= 'Expect 69 persisted variables shown as PERSISTED in variables_info table.'
+--let $assert_cond= [SELECT COUNT(*) as count FROM performance_schema.variables_info WHERE variable_source="PERSISTED", count, 1] = 69
 --source include/assert.inc
 
---let $assert_text= 'Expect 70 persisted variables with matching peristed and global values.'
---let $assert_cond= [SELECT COUNT(*) as count FROM performance_schema.variables_info vi JOIN performance_schema.persisted_variables pv JOIN performance_schema.global_variables gv ON vi.variable_name=pv.variable_name AND vi.variable_name=gv.variable_name AND pv.variable_value=gv.variable_value WHERE vi.variable_source="PERSISTED", count, 1] = 70
+--let $assert_text= 'Expect 69 persisted variables with matching peristed and global values.'
+--let $assert_cond= [SELECT COUNT(*) as count FROM performance_schema.variables_info vi JOIN performance_schema.persisted_variables pv JOIN performance_schema.global_variables gv ON vi.variable_name=pv.variable_name AND vi.variable_name=gv.variable_name AND pv.variable_value=gv.variable_value WHERE vi.variable_source="PERSISTED", count, 1] = 69
 --source include/assert.inc
 
 
@@ -123,7 +123,7 @@ while ( $varid <= $countvars )
 {
   --let $varnames= `SELECT varname FROM rplvars WHERE id=$varid`
 
-  if (`SELECT '$varnames' IN ('gtid_executed', 'gtid_owned', 'log_bin', 'log_bin_basename', 'log_bin_index', 'relay_log', 'relay_log_basename', 'relay_log_index', 'relay_log_info_file', 'slave_load_tmpdir')`)
+  if (`SELECT '$varnames' IN ('gtid_executed', 'gtid_owned', 'log_bin', 'log_bin_basename', 'log_bin_index', 'relay_log', 'relay_log_basename', 'relay_log_index', 'relay_log_info_file', 'slave_load_tmpdir', 'log_bin_use_v1_row_events')`)
   {
     --error ER_VAR_DOES_NOT_EXIST
   }

mysql-test/suite/binlog_nogtid/t/binlog_persist_variables.test

@@ -70,7 +70,7 @@ while ( $varid <= $countvars )
   --let $varnames= `SELECT varname FROM rplvars WHERE id=$varid;`
 
   # Following variables are either non persistent or read only variables.
-  if (`SELECT '$varnames' IN ('binlog_gtid_simple_recovery', 'gtid_executed', 'gtid_next', 'gtid_owned', 'log_bin', 'log_bin_basename', 'log_bin_index', 'log_slave_updates', 'relay_log', 'relay_log_basename', 'relay_log_index', 'relay_log_index', 'relay_log_info_file', 'relay_log_recovery', 'relay_log_space_limit', 'slave_load_tmpdir', 'slave_load_tmpdir', 'slave_skip_errors')`)
+  if (`SELECT '$varnames' IN ('binlog_gtid_simple_recovery', 'gtid_executed', 'gtid_next', 'gtid_owned', 'log_bin', 'log_bin_basename', 'log_bin_index', 'log_slave_updates', 'relay_log', 'relay_log_basename', 'relay_log_index', 'relay_log_index', 'relay_log_info_file', 'relay_log_recovery', 'relay_log_space_limit', 'slave_load_tmpdir', 'slave_load_tmpdir', 'slave_skip_errors', 'log_bin_use_v1_row_events')`)
   {
     --error ER_INCORRECT_GLOBAL_LOCAL_VAR
   }
@@ -80,8 +80,8 @@ while ( $varid <= $countvars )
 }
 
 --echo
---let $assert_text= 'Expect 65 persisted variables in persisted_variables table.'
---let $assert_cond= [SELECT COUNT(*) as count FROM performance_schema.persisted_variables, count, 1] = 65
+--let $assert_text= 'Expect 64 persisted variables in persisted_variables table.'
+--let $assert_cond= [SELECT COUNT(*) as count FROM performance_schema.persisted_variables, count, 1] = 64
 --source include/assert.inc
 
 --echo
@@ -92,16 +92,16 @@ while ( $varid <= $countvars )
 --source include/wait_until_connected_again.inc
 
 --echo
---let $assert_text= 'Expect 65 persisted variables in persisted_variables table.'
---let $assert_cond= [SELECT COUNT(*) as count FROM performance_schema.persisted_variables, count, 1] = 65
+--let $assert_text= 'Expect 64 persisted variables in persisted_variables table.'
+--let $assert_cond= [SELECT COUNT(*) as count FROM performance_schema.persisted_variables, count, 1] = 64
 --source include/assert.inc
 
---let $assert_text= 'Expect 65 persisted variables shown as PERSISTED in variables_info table.'
---let $assert_cond= [SELECT COUNT(*) as count FROM performance_schema.variables_info WHERE variable_source="PERSISTED", count, 1] = 65
+--let $assert_text= 'Expect 64 persisted variables shown as PERSISTED in variables_info table.'
+--let $assert_cond= [SELECT COUNT(*) as count FROM performance_schema.variables_info WHERE variable_source="PERSISTED", count, 1] = 64
 --source include/assert.inc
 
---let $assert_text= 'Expect 65 persisted variables with matching peristed and global values.'
---let $assert_cond= [SELECT COUNT(*) as count FROM performance_schema.variables_info vi JOIN performance_schema.persisted_variables pv JOIN performance_schema.global_variables gv ON vi.variable_name=pv.variable_name AND vi.variable_name=gv.variable_name AND pv.variable_value=gv.variable_value WHERE vi.variable_source="PERSISTED", count, 1] = 65
+--let $assert_text= 'Expect 64 persisted variables with matching peristed and global values.'
+--let $assert_cond= [SELECT COUNT(*) as count FROM performance_schema.variables_info vi JOIN performance_schema.persisted_variables pv JOIN performance_schema.global_variables gv ON vi.variable_name=pv.variable_name AND vi.variable_name=gv.variable_name AND pv.variable_value=gv.variable_value WHERE vi.variable_source="PERSISTED", count, 1] = 64
 --source include/assert.inc