Bug#29013375 - CONTRIBUTION BY FACEBOOK: STORE ALL_PERSISTED_VARIABLES.TEST COUNTERS IN VA ..

Description :
This diff changes all_persisted_variables.test to limit the number of
hardcoded values in the test output by putting them into local variables. New
patches that are then rebased on top which add new system variables do not
need to change as many lines of the original test case, making it easier on
the rebase process.

Also removed the entries for Bugs that were fixed and modified the queries
to included the server variables cthat were not tested due to open bugs.

Reviewed by:
Parakh Agarwal <parakh.agarwal@oracle.com>
RB: 21493

Author: Mohit Joshi

mysql-test/r/all_persisted_variables.result

@@ -29,31 +29,25 @@ CREATE TABLE all_vars (id INT PRIMARY KEY AUTO_INCREMENT, var_name VARCHAR(64),
 INSERT INTO all_vars (var_name, var_value)
 SELECT * FROM performance_schema.global_variables
 WHERE variable_name NOT IN
-('keyring_operations',
-'mandatory_roles',
-'innodb_ft_aux_table',
-'innodb_ft_user_stopword_table',
-'innodb_tmpdir',
-'innodb_ft_server_stopword_table',
-'rbr_exec_mode')
+('rbr_exec_mode')
 AND variable_name NOT LIKE 'ndb_%'
 ORDER BY variable_name;
 
-include/assert.inc ['Expect 554 variables in the table. Due to open Bugs, we are checking for 547']
+include/assert.inc [Expect 500+ variables in the table. Due to open Bugs, we are checking for fewer ]
 
 # Test SET PERSIST
 
-include/assert.inc [Expect 377 persisted variables in the table. Due to open Bugs, we are checking for 372]
+include/assert.inc [Expect 377 persisted variables in the table.]
 
 ************************************************************
 * 3. Restart server, it must preserve the persisted variable
 *    settings. Verify persisted configuration.
 ************************************************************
 # restart
 
-include/assert.inc [Expect 372 persisted variables in persisted_variables table.]
-include/assert.inc [Expect 372 persisted variables shown as PERSISTED in variables_info table.]
-include/assert.inc [Expect 372 persisted variables with matching peristed and global values.]
+include/assert.inc [Expect 377 persisted variables in persisted_variables table.]
+include/assert.inc [Expect 377 persisted variables shown as PERSISTED in variables_info table.]
+include/assert.inc [Expect 377 persisted variables with matching peristed and global values.]
 
 ************************************************************
 * 4. Test RESET PERSIST IF EXISTS. Verify persisted variable

mysql-test/t/all_persisted_variables.test

@@ -19,7 +19,7 @@
 #    removed.
 # 5. Clean up.
 
-# Note - Currently there are 571 global variables
+# Note - Currently there are $total_global_vars global variables
 #      -> SELECT COUNT(*) FROM performance_schema.global_variables
 # In future, if a new global variable is added, it will be automatically
 # picked up from performance_schema.global_variables table.
@@ -102,32 +102,29 @@ while($var_id <= $count_vars)
 
 CREATE TABLE all_vars (id INT PRIMARY KEY AUTO_INCREMENT, var_name VARCHAR(64), var_value VARCHAR(1024));
 
-# Currently we are not able to test the below 11 global variables because of
-# open bugs (listed below). Once the bugs are fixed,
-# below query must be modified.
+# Currently we are not able to test below global variables
+# 1. rbr_exec_mode
+#
+# because of open bugs (listed below).
 #
-# Bug#27512616 - SET PERSIST COMMAND FAILS TO MAP DEFAULT(NULL) VALUES IN MYSQLD-AUTO.CNF
-# Bug#27523095 - SET PERSIST MANDATORY_ROLES FAILS TO START THE SERVER
 # Bug#27534122 - RBR_EXEC_MODE DOES NOT SUPPORT GLOBAL SCOPE
-# Bug#27534041 - SET GLOBAL INNODB_MONITOR_ENABLE CAUSES SERVER TO CRASH
+#
+# Once the bugs is fixed, below $bug_var_count must be modified along with the query.
+
+--let $bug_var_count=1
+--expr $expected_var_count=$total_global_vars - $bug_var_count
 
 INSERT INTO all_vars (var_name, var_value)
 SELECT * FROM performance_schema.global_variables
 WHERE variable_name NOT IN
-('keyring_operations',
-'mandatory_roles',
-'innodb_ft_aux_table',
-'innodb_ft_user_stopword_table',
-'innodb_tmpdir',
-'innodb_ft_server_stopword_table',
-'rbr_exec_mode')
+('rbr_exec_mode')
 AND variable_name NOT LIKE 'ndb_%'
 ORDER BY variable_name;
 
 --let $count_vars= `SELECT COUNT(*) FROM all_vars;`
 --echo
---let $assert_text= 'Expect 554 variables in the table. Due to open Bugs, we are checking for 547'
---let $assert_cond= [SELECT COUNT(*) as count FROM all_vars, count, 1] = $total_global_vars-7
+--let $assert_text= Expect 500+ variables in the table. Due to open Bugs, we are checking for fewer 
+--let $assert_cond= [SELECT COUNT(*) as count FROM all_vars, count, 1] = $expected_var_count
 --source include/assert.inc
 
 --echo
@@ -144,26 +141,16 @@ while($var_id <= $count_vars)
 }
 # Below 4 tests have default value as "" and these variables can't be set to
 # empty value. Hence, setting them seperately.
-SET PERSIST innodb_monitor_enable= "latch";
+SET PERSIST innodb_monitor_enable="latch";
 SET PERSIST innodb_monitor_disable="latch";
 SET PERSIST innodb_monitor_reset="latch";
 SET PERSIST innodb_monitor_reset_all="latch";
 
 --enable_warnings
 --enable_query_log
 --echo
---let $buggy_global_vars = 5
---expr $expected_total_persistent_vars = $total_persistent_vars - $buggy_global_vars
---let $assert_text= Expect $total_persistent_vars persisted variables in the table. Due to open Bugs, we are checking for $expected_total_persistent_vars
-
-# Below are the persisted variables we are unable to test at the moment due to
-# existing Bugs.
-# 1. keyring_operations              (Bug#27523095)
-# 2. mandatory_roles                 (Bug#27523095)
-# 3. innodb_ft_aux_table             (Bug#27512616)
-# 4. innodb_ft_user_stopword_table   (Bug#27512616)
-# 5. innodb_ft_server_stopword_table (Bug#27512616)
---let $assert_cond= [SELECT COUNT(*) as count FROM performance_schema.persisted_variables, count, 1] = $expected_total_persistent_vars
+--let $assert_text= Expect $total_persistent_vars persisted variables in the table.
+--let $assert_cond= [SELECT COUNT(*) as count FROM performance_schema.persisted_variables, count, 1] = $total_persistent_vars
 --source include/assert.inc
 
 --echo
@@ -176,16 +163,16 @@ SET PERSIST innodb_monitor_reset_all="latch";
 --source include/wait_until_connected_again.inc
 
 --echo
---let $assert_text= Expect $expected_total_persistent_vars persisted variables in persisted_variables table.
---let $assert_cond= [SELECT COUNT(*) as count FROM performance_schema.persisted_variables, count, 1] = $expected_total_persistent_vars
+--let $assert_text= Expect $total_persistent_vars persisted variables in persisted_variables table.
+--let $assert_cond= [SELECT COUNT(*) as count FROM performance_schema.persisted_variables, count, 1] = $total_persistent_vars
 --source include/assert.inc
 
---let $assert_text= Expect $expected_total_persistent_vars 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] = $expected_total_persistent_vars
+--let $assert_text= Expect $total_persistent_vars 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] = $total_persistent_vars
 --source include/assert.inc
 
- --let $assert_text= Expect $expected_total_persistent_vars 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] = $expected_total_persistent_vars
+ --let $assert_text= Expect $total_persistent_vars 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] = $total_persistent_vars
 --source include/assert.inc
 
 --echo