From 307d935e2d366cef879f7bc4ce259bf1029b4918 Mon Sep 17 00:00:00 2001
From: Oleg Smirnov <olernov@gmail.com>
Date: Mon, 24 Oct 2022 19:59:58 +0700
Subject: [PATCH] MDEV-29858 Missing DBUG_RETURN or DBUG_VOID_RETURN in
 fill_schema_proc

---
 mysql-test/main/information_schema_parameters.result | 4 ++++
 mysql-test/main/information_schema_parameters.test   | 4 ++++
 sql/sql_show.cc                                      | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/mysql-test/main/information_schema_parameters.result b/mysql-test/main/information_schema_parameters.result
index a265f73d788..1d00c992e5c 100644
--- a/mysql-test/main/information_schema_parameters.result
+++ b/mysql-test/main/information_schema_parameters.result
@@ -801,5 +801,9 @@ SHOW STATUS LIKE 'handler_read%next';
 Variable_name	Value
 Handler_read_next	1
 Handler_read_rnd_next	2
+SELECT COUNT(*) FROM information_schema.PARAMETERS
+WHERE SPECIFIC_CATALOG = NULL;
+COUNT(*)
+#
 DROP DATABASE i_s_parameters_test;
 USE test;
diff --git a/mysql-test/main/information_schema_parameters.test b/mysql-test/main/information_schema_parameters.test
index f689ee4eddc..e1c64d4bacd 100644
--- a/mysql-test/main/information_schema_parameters.test
+++ b/mysql-test/main/information_schema_parameters.test
@@ -339,6 +339,10 @@ query_vertical SELECT * FROM INFORMATION_SCHEMA.PARAMETERS
   AND SPECIFIC_NAME = 'процедурка';
 SHOW STATUS LIKE 'handler_read%next';
 
+--replace_column 1 #
+SELECT COUNT(*) FROM information_schema.PARAMETERS
+  WHERE SPECIFIC_CATALOG = NULL;
+
 # Cleanup
 DROP DATABASE i_s_parameters_test;
 USE test;
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index a9eb876fb99..c77759c3e8b 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -6804,7 +6804,7 @@ int fill_schema_proc(THD *thd, TABLE_LIST *tables, COND *cond)
   if (get_lookup_field_values(thd, cond, false, tables, &lookup))
   {
     // There can be no matching records for the condition
-    return 0;
+    DBUG_RETURN(0);
   }
 
   start_new_trans new_trans(thd);