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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
418518c0
Commit
418518c0
authored
Jan 27, 2016
by
Alexey Botchkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-5273 Prepared statement doesn't return metadata after prepare.
Keep the embedded-server version valid.
parent
d16d40be
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
0 deletions
+9
-0
sql/sql_prepare.cc
sql/sql_prepare.cc
+9
-0
No files found.
sql/sql_prepare.cc
View file @
418518c0
...
...
@@ -1871,6 +1871,7 @@ static bool mysql_test_show_create_db(Prepared_statement *stmt)
}
#ifndef NO_EMBEDDED_ACCESS_CHECKS
/**
Validate and prepare for execution SHOW GRANTS statement.
...
...
@@ -1892,8 +1893,10 @@ static bool mysql_test_show_grants(Prepared_statement *stmt)
DBUG_RETURN
(
send_stmt_metadata
(
thd
,
stmt
,
&
fields
));
}
#endif
/*NO_EMBEDDED_ACCESS_CHECKS*/
#ifndef EMBEDDED_LIBRARY
/**
Validate and prepare for execution SHOW SLAVE STATUS statement.
...
...
@@ -1962,6 +1965,8 @@ static bool mysql_test_show_binlogs(Prepared_statement *stmt)
DBUG_RETURN
(
send_stmt_metadata
(
thd
,
stmt
,
&
fields
));
}
#endif
/* EMBEDDED_LIBRARY */
/**
Validate and prepare for execution SHOW CREATE PROC/FUNC statement.
...
...
@@ -2333,6 +2338,7 @@ static bool check_prepared_statement(Prepared_statement *stmt)
DBUG_RETURN
(
FALSE
);
}
break
;
#ifndef NO_EMBEDDED_ACCESS_CHECKS
case
SQLCOM_SHOW_GRANTS
:
if
(
!
(
res
=
mysql_test_show_grants
(
stmt
)))
{
...
...
@@ -2340,6 +2346,8 @@ static bool check_prepared_statement(Prepared_statement *stmt)
DBUG_RETURN
(
FALSE
);
}
break
;
#endif
/* NO_EMBEDDED_ACCESS_CHECKS */
#ifndef EMBEDDED_LIBRARY
case
SQLCOM_SHOW_SLAVE_STAT
:
if
(
!
(
res
=
mysql_test_show_slave_status
(
stmt
)))
{
...
...
@@ -2361,6 +2369,7 @@ static bool check_prepared_statement(Prepared_statement *stmt)
DBUG_RETURN
(
FALSE
);
}
break
;
#endif
/* EMBEDDED_LIBRARY */
case
SQLCOM_SHOW_CREATE_PROC
:
if
(
!
(
res
=
mysql_test_show_create_routine
(
stmt
,
TYPE_ENUM_PROCEDURE
)))
{
...
...
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