database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

MDEV-29858 Missing DBUG_RETURN or DBUG_VOID_RETURN in fill_schema_proc

Browse Source
This commit is contained in:
Oleg Smirnov
2022-10-24 19:59:58 +07:00
parent af59b677ea
commit 307d935e2d
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/main/information_schema_parameters.result
View File

@@ -801,5 +801,9 @@ SHOW STATUS LIKE 'handler_read%next';
Variable_name Value Variable_name Value
Handler_read_next 1 Handler_read_next 1
Handler_read_rnd_next 2 Handler_read_rnd_next 2
SELECT COUNT(*) FROM information_schema.PARAMETERS
WHERE SPECIFIC_CATALOG = NULL;
COUNT(*)
#
DROP DATABASE i_s_parameters_test; DROP DATABASE i_s_parameters_test;
USE test; USE test;

4
mysql-test/main/information_schema_parameters.test
View File

@@ -339,6 +339,10 @@ query_vertical SELECT * FROM INFORMATION_SCHEMA.PARAMETERS
AND SPECIFIC_NAME = 'процедурка'; AND SPECIFIC_NAME = 'процедурка';
SHOW STATUS LIKE 'handler_read%next'; SHOW STATUS LIKE 'handler_read%next';
--replace_column 1 #
SELECT COUNT(*) FROM information_schema.PARAMETERS
WHERE SPECIFIC_CATALOG = NULL;
# Cleanup # Cleanup
DROP DATABASE i_s_parameters_test; DROP DATABASE i_s_parameters_test;
USE test; USE test;

2
sql/sql_show.cc
View File

@@ -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)) if (get_lookup_field_values(thd, cond, false, tables, &lookup))
{ {
// There can be no matching records for the condition // There can be no matching records for the condition
return 0; DBUG_RETURN(0);
} }
start_new_trans new_trans(thd); start_new_trans new_trans(thd);