From e9c494c8438c7fcfe8edd197c9a6919be4a02ab0 Mon Sep 17 00:00:00 2001
From: Alexander Barkov <bar@mariadb.com>
Date: Thu, 21 Mar 2019 08:48:44 +0400
Subject: [PATCH] Fixing a failure in tests for "MDEV-18892 Regression in slow
 log and admin statements"

Tests for MDEV-18892 failed, because of extra 'Prepare' and 'Close stmt'
entries in the output.

Filtering out PS related entries (where it is necessary).
---
 mysql-test/r/log_slow_debug.result | 13 +++++++++++--
 mysql-test/t/log_slow_debug.test   | 13 +++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/mysql-test/r/log_slow_debug.result b/mysql-test/r/log_slow_debug.result
index a823f4c2b98..bf803ad0530 100644
--- a/mysql-test/r/log_slow_debug.result
+++ b/mysql-test/r/log_slow_debug.result
@@ -14,6 +14,14 @@ FROM mysql.slow_log
 WHERE sql_text NOT LIKE '%debug_dbug%';
 END
 $$
+CREATE PROCEDURE show_slow_log_exclude_ps()
+BEGIN
+SELECT CONCAT('[slow] ', sql_text) AS sql_text
+FROM mysql.slow_log
+WHERE sql_text NOT LIKE '%debug_dbug%'
+       AND sql_text NOT IN ('Prepare','Close stmt');
+END
+$$
 #
 # Expect all admin statements in the slow log (ON,DEFAULT)
 #
@@ -33,7 +41,7 @@ PREPARE stmt FROM 'ALTER TABLE t4 MODIFY a INT DEFAULT 1';
 EXECUTE stmt;
 DEALLOCATE PREPARE stmt;
 DROP TABLE t4;
-CALL show_slow_log();
+CALL show_slow_log_exclude_ps();
 sql_text
 [slow] TRUNCATE TABLE mysql.slow_log
 [slow] CREATE TABLE t1 (a INT)
@@ -115,7 +123,7 @@ PREPARE stmt FROM 'ALTER TABLE t4 MODIFY a INT DEFAULT 1';
 EXECUTE stmt;
 DEALLOCATE PREPARE stmt;
 DROP TABLE t4;
-CALL show_slow_log();
+CALL show_slow_log_exclude_ps();
 sql_text
 [slow] TRUNCATE TABLE mysql.slow_log
 [slow] CREATE TABLE t1 (a INT)
@@ -135,3 +143,4 @@ SET @@global.slow_query_log= @org_slow_query_log;
 SET @@global.log_output= @org_log_output;
 SET @@global.log_slow_admin_statements= @org_log_slow_admin_statements;
 DROP PROCEDURE show_slow_log;
+DROP PROCEDURE show_slow_log_exclude_ps;
diff --git a/mysql-test/t/log_slow_debug.test b/mysql-test/t/log_slow_debug.test
index 35b5b93423d..7945328fee3 100644
--- a/mysql-test/t/log_slow_debug.test
+++ b/mysql-test/t/log_slow_debug.test
@@ -19,6 +19,14 @@ BEGIN
      WHERE sql_text NOT LIKE '%debug_dbug%';
 END
 $$
+CREATE PROCEDURE show_slow_log_exclude_ps()
+BEGIN
+  SELECT CONCAT('[slow] ', sql_text) AS sql_text
+    FROM mysql.slow_log
+     WHERE sql_text NOT LIKE '%debug_dbug%'
+       AND sql_text NOT IN ('Prepare','Close stmt');
+END
+$$
 DELIMITER ;$$
 
 
@@ -42,7 +50,7 @@ PREPARE stmt FROM 'ALTER TABLE t4 MODIFY a INT DEFAULT 1';
 EXECUTE stmt;
 DEALLOCATE PREPARE stmt;
 DROP TABLE t4;
-CALL show_slow_log();
+CALL show_slow_log_exclude_ps();
 
 
 --echo #
@@ -111,7 +119,7 @@ PREPARE stmt FROM 'ALTER TABLE t4 MODIFY a INT DEFAULT 1';
 EXECUTE stmt;
 DEALLOCATE PREPARE stmt;
 DROP TABLE t4;
-CALL show_slow_log();
+CALL show_slow_log_exclude_ps();
 
 
 --echo #
@@ -124,3 +132,4 @@ SET @@global.slow_query_log= @org_slow_query_log;
 SET @@global.log_output= @org_log_output;
 SET @@global.log_slow_admin_statements= @org_log_slow_admin_statements;
 DROP PROCEDURE show_slow_log;
+DROP PROCEDURE show_slow_log_exclude_ps;