Modifying ps_trace_statement_digest and ps_trace_thread so:

   * sql_log_bin is set to OFF already in the topmost procedures
   * restore INSTRUMENTED for the thread executing the procedure

and fix that in_auto_enable didn't actually do anything for ps_trace_statement_digest.sql

Author: JesperWisborgKrogh

procedures/ps_trace_statement_digest.sql

@@ -43,6 +43,8 @@ CREATE DEFINER='root'@'localhost' PROCEDURE ps_trace_statement_digest (
              Performance Schema truncates long SQL_TEXT values (and hence the 
              EXPLAIN will fail due to parse errors).
 
+             Requires the SUPER privilege for "SET sql_log_bin = 0;".
+
              Parameters
              -----------
 
@@ -141,11 +143,16 @@ BEGIN
 
     DECLARE v_start_fresh BOOLEAN DEFAULT false;
     DECLARE v_auto_enable BOOLEAN DEFAULT false;
+    DECLARE v_this_thread_enabed ENUM('YES', 'NO');
     DECLARE v_runtime INT DEFAULT 0;
     DECLARE v_start INT DEFAULT 0;
     DECLARE v_found_stmts INT;
 
+    SET @log_bin := @@sql_log_bin;
+    SET sql_log_bin = 0;
+
     /* Do not track the current thread, it will kill the stack */
+    SELECT INSTRUMENTED INTO v_this_thread_enabed FROM performance_schema.threads WHERE PROCESSLIST_ID = CONNECTION_ID();
     CALL sys.ps_setup_disable_thread(CONNECTION_ID());
 
     DROP TEMPORARY TABLE IF EXISTS stmt_trace;
@@ -185,6 +192,22 @@ BEGIN
     SET v_auto_enable = in_auto_enable;
     IF v_auto_enable THEN
         CALL sys.ps_setup_save(0);
+
+        UPDATE performance_schema.threads
+           SET INSTRUMENTED = IF(PROCESSLIST_ID IS NOT NULL, 'YES', 'NO');
+
+        -- Only the events_statements_history_long and events_stages_history_long tables and their ancestors are needed
+        UPDATE performance_schema.setup_consumers
+           SET ENABLED = 'YES'
+         WHERE NAME NOT LIKE '%\_history'
+               AND NAME NOT LIKE 'events_wait%'
+               AND NAME NOT LIKE 'events_transactions%'
+               AND NAME <> 'statements_digest';
+
+        UPDATE performance_schema.setup_instruments
+           SET ENABLED = 'YES',
+               TIMED   = 'YES'
+         WHERE NAME LIKE 'statement/%' OR NAME LIKE 'stage/%';
     END IF;
 
     WHILE v_runtime < in_runtime DO
@@ -261,10 +284,14 @@ BEGIN
     DEALLOCATE PREPARE explain_stmt;
 
     IF v_auto_enable THEN
-        CALL sys.ps_reload_saved();
+        CALL sys.ps_setup_reload_saved();
+    END IF;
+    /* Restore INSTRUMENTED for this thread */
+    IF (v_this_thread_enabed = 'YES') THEN
         CALL sys.ps_setup_enable_thread(CONNECTION_ID());
     END IF;
 
+    SET sql_log_bin = @log_bin;
 END$$
 
 DELIMITER ;

procedures/ps_trace_thread.sql

@@ -34,6 +34,8 @@ CREATE DEFINER='root'@'localhost' PROCEDURE ps_trace_thread (
 
              Each resultset returned from the procedure should be used for a complete graph
 
+             Requires the SUPER privilege for "SET sql_log_bin = 0;".
+
              Parameters
              -----------
 
@@ -108,6 +110,7 @@ BEGIN
     DECLARE v_done bool DEFAULT FALSE;
     DECLARE v_start, v_runtime DECIMAL(20,2) DEFAULT 0.0;
     DECLARE v_min_event_id bigint unsigned DEFAULT 0;
+    DECLARE v_this_thread_enabed ENUM('YES', 'NO');
     DECLARE v_event longtext;
     DECLARE c_stack CURSOR FOR
         SELECT CONCAT(IF(nesting_event_id IS NOT NULL, CONCAT(nesting_event_id, ' -> '), ''), 
@@ -216,7 +219,11 @@ BEGIN
        ORDER BY event_id;
     DECLARE CONTINUE HANDLER FOR NOT FOUND SET v_done = TRUE;
 
+    SET @log_bin := @@sql_log_bin;
+    SET sql_log_bin = 0;
+
     /* Do not track the current thread, it will kill the stack */
+    SELECT INSTRUMENTED INTO v_this_thread_enabed FROM performance_schema.threads WHERE PROCESSLIST_ID = CONNECTION_ID();
     CALL sys.ps_setup_disable_thread(CONNECTION_ID());
 
     IF (in_auto_setup) THEN
@@ -302,8 +309,13 @@ BEGIN
     /* Reset the settings for the performance schema */
     IF (in_auto_setup) THEN
         CALL sys.ps_setup_reload_saved();
+    END IF;
+    /* Restore INSTRUMENTED for this thread */
+    IF (v_this_thread_enabed = 'YES') THEN
         CALL sys.ps_setup_enable_thread(CONNECTION_ID());
     END IF;
+
+    SET sql_log_bin = @log_bin;
 END$$
 
 DELIMITER ;