Commit 418518c0 authored by Alexey Botchkov's avatar Alexey Botchkov

MDEV-5273 Prepared statement doesn't return metadata after prepare.

        Keep the embedded-server version valid.
parent d16d40be
...@@ -1871,6 +1871,7 @@ static bool mysql_test_show_create_db(Prepared_statement *stmt) ...@@ -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. Validate and prepare for execution SHOW GRANTS statement.
...@@ -1892,8 +1893,10 @@ static bool mysql_test_show_grants(Prepared_statement *stmt) ...@@ -1892,8 +1893,10 @@ static bool mysql_test_show_grants(Prepared_statement *stmt)
DBUG_RETURN(send_stmt_metadata(thd, stmt, &fields)); 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. Validate and prepare for execution SHOW SLAVE STATUS statement.
...@@ -1962,6 +1965,8 @@ static bool mysql_test_show_binlogs(Prepared_statement *stmt) ...@@ -1962,6 +1965,8 @@ static bool mysql_test_show_binlogs(Prepared_statement *stmt)
DBUG_RETURN(send_stmt_metadata(thd, stmt, &fields)); DBUG_RETURN(send_stmt_metadata(thd, stmt, &fields));
} }
#endif /* EMBEDDED_LIBRARY */
/** /**
Validate and prepare for execution SHOW CREATE PROC/FUNC statement. Validate and prepare for execution SHOW CREATE PROC/FUNC statement.
...@@ -2333,6 +2338,7 @@ static bool check_prepared_statement(Prepared_statement *stmt) ...@@ -2333,6 +2338,7 @@ static bool check_prepared_statement(Prepared_statement *stmt)
DBUG_RETURN(FALSE); DBUG_RETURN(FALSE);
} }
break; break;
#ifndef NO_EMBEDDED_ACCESS_CHECKS
case SQLCOM_SHOW_GRANTS: case SQLCOM_SHOW_GRANTS:
if (!(res= mysql_test_show_grants(stmt))) if (!(res= mysql_test_show_grants(stmt)))
{ {
...@@ -2340,6 +2346,8 @@ static bool check_prepared_statement(Prepared_statement *stmt) ...@@ -2340,6 +2346,8 @@ static bool check_prepared_statement(Prepared_statement *stmt)
DBUG_RETURN(FALSE); DBUG_RETURN(FALSE);
} }
break; break;
#endif /* NO_EMBEDDED_ACCESS_CHECKS */
#ifndef EMBEDDED_LIBRARY
case SQLCOM_SHOW_SLAVE_STAT: case SQLCOM_SHOW_SLAVE_STAT:
if (!(res= mysql_test_show_slave_status(stmt))) if (!(res= mysql_test_show_slave_status(stmt)))
{ {
...@@ -2361,6 +2369,7 @@ static bool check_prepared_statement(Prepared_statement *stmt) ...@@ -2361,6 +2369,7 @@ static bool check_prepared_statement(Prepared_statement *stmt)
DBUG_RETURN(FALSE); DBUG_RETURN(FALSE);
} }
break; break;
#endif /* EMBEDDED_LIBRARY */
case SQLCOM_SHOW_CREATE_PROC: case SQLCOM_SHOW_CREATE_PROC:
if (!(res= mysql_test_show_create_routine(stmt, TYPE_ENUM_PROCEDURE))) if (!(res= mysql_test_show_create_routine(stmt, TYPE_ENUM_PROCEDURE)))
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment