Adding upstream version 1:10.11.6.upstream/1%10.11.6

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

7 files changed, 46 insertions, 0 deletions

diff --git a/mysql-test/suite/sysschema/include/ps_setup_actors_cleanup.inc b/mysql-test/suite/sysschema/include/ps_setup_actors_cleanup.inc
new file mode 100644
index 00000000..0e18278d
--- /dev/null
+++ b/mysql-test/suite/sysschema/include/ps_setup_actors_cleanup.inc
@@ -0,0 +1,5 @@
+# Reset the performance_schema.setup_actors table
+
+TRUNCATE TABLE performance_schema.setup_actors;
+
+INSERT INTO performance_schema.setup_actors VALUES ('%', '%', '%', 'YES', 'YES');
diff --git a/mysql-test/suite/sysschema/include/ps_setup_consumers_cleanup.inc b/mysql-test/suite/sysschema/include/ps_setup_consumers_cleanup.inc
new file mode 100644
index 00000000..ee591ec6
--- /dev/null
+++ b/mysql-test/suite/sysschema/include/ps_setup_consumers_cleanup.inc
@@ -0,0 +1,3 @@
+# Reset the performance_schema.setup_consumers table
+
+UPDATE performance_schema.setup_consumers SET enabled = 'YES';
diff --git a/mysql-test/suite/sysschema/include/ps_setup_instruments_cleanup.inc b/mysql-test/suite/sysschema/include/ps_setup_instruments_cleanup.inc
new file mode 100644
index 00000000..aa782d12
--- /dev/null
+++ b/mysql-test/suite/sysschema/include/ps_setup_instruments_cleanup.inc
@@ -0,0 +1,3 @@
+# Reset the performance_schema.setup_instruments table
+
+UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES';
diff --git a/mysql-test/suite/sysschema/include/ps_setup_reset_to_default_cleanup.inc b/mysql-test/suite/sysschema/include/ps_setup_reset_to_default_cleanup.inc
new file mode 100644
index 00000000..6be56538
--- /dev/null
+++ b/mysql-test/suite/sysschema/include/ps_setup_reset_to_default_cleanup.inc
@@ -0,0 +1,9 @@
+# Reset all Performance Schema configuration
+
+--source ./ps_setup_instruments_cleanup.inc
+
+--source ./ps_setup_actors_cleanup.inc
+
+--source ./ps_setup_consumers_cleanup.inc
+
+--source ./ps_threads_cleanup.inc
diff --git a/mysql-test/suite/sysschema/include/ps_threads_cleanup.inc b/mysql-test/suite/sysschema/include/ps_threads_cleanup.inc
new file mode 100644
index 00000000..708f2f7c
--- /dev/null
+++ b/mysql-test/suite/sysschema/include/ps_threads_cleanup.inc
@@ -0,0 +1,3 @@
+# Reset the performance_schema.setup_consumers table
+
+UPDATE performance_schema.threads SET instrumented = 'YES';
diff --git a/mysql-test/suite/sysschema/include/ps_truncate_all_tables.inc b/mysql-test/suite/sysschema/include/ps_truncate_all_tables.inc
new file mode 100644
index 00000000..4811b8af
--- /dev/null
+++ b/mysql-test/suite/sysschema/include/ps_truncate_all_tables.inc
@@ -0,0 +1,6 @@
+# Reset all underlying Performance Schema data
+
+--disable_result_log
+--disable_query_log ONCE
+CALL sys.ps_truncate_all_tables(FALSE);
+--enable_result_log
diff --git a/mysql-test/suite/sysschema/include/sys_config_cleanup.inc b/mysql-test/suite/sysschema/include/sys_config_cleanup.inc
new file mode 100644
index 00000000..af8d0362
--- /dev/null
+++ b/mysql-test/suite/sysschema/include/sys_config_cleanup.inc
@@ -0,0 +1,17 @@
+# Reset the sys.sys_config table
+
+# Note, we have to disable the triggers to reset the set_by column back to NULL
+# as the sys.sys_config_update_set_user trigger will overwrite it to the current user
+SET @sys.ignore_sys_config_triggers := true;
+
+DELETE FROM sys.sys_config;
+
+INSERT IGNORE INTO sys.sys_config (variable, value) VALUES
+    ('statement_truncate_len', 64),
+    ('statement_performance_analyzer.limit', 100),
+    ('statement_performance_analyzer.view', NULL),
+    ('diagnostics.allow_i_s_tables', 'OFF'),
+    ('diagnostics.include_raw', 'OFF'),
+    ('ps_thread_trx_info.max_length', 65535);
+
+SET @sys.ignore_sys_config_triggers := NULL;