Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
307d935e
Commit
307d935e
authored
Oct 24, 2022
by
Oleg Smirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-29858 Missing DBUG_RETURN or DBUG_VOID_RETURN in fill_schema_proc
parent
af59b677
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
1 deletion
+9
-1
mysql-test/main/information_schema_parameters.result
mysql-test/main/information_schema_parameters.result
+4
-0
mysql-test/main/information_schema_parameters.test
mysql-test/main/information_schema_parameters.test
+4
-0
sql/sql_show.cc
sql/sql_show.cc
+1
-1
No files found.
mysql-test/main/information_schema_parameters.result
View file @
307d935e
...
@@ -801,5 +801,9 @@ SHOW STATUS LIKE 'handler_read%next';
...
@@ -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;
mysql-test/main/information_schema_parameters.test
View file @
307d935e
...
@@ -339,6 +339,10 @@ query_vertical SELECT * FROM INFORMATION_SCHEMA.PARAMETERS
...
@@ -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
;
sql/sql_show.cc
View file @
307d935e
...
@@ -6804,7 +6804,7 @@ int fill_schema_proc(THD *thd, TABLE_LIST *tables, COND *cond)
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment