Skip to content

Commit

Permalink
MDEV-5273 Prepared statement doesn't return metadata after prepare.
Browse files Browse the repository at this point in the history
        Keep the embedded-server version valid.
  • Loading branch information
Alexey Botchkov committed Jan 28, 2016
1 parent d16d40b commit 418518c
Showing 1 changed file with 9 additions and 0 deletions.
9 changes: 9 additions & 0 deletions sql/sql_prepare.cc
Expand Up @@ -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.
Expand All @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -2333,13 +2338,16 @@ 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)))
{
/* Statement and field info has already been sent */
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)))
{
Expand All @@ -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)))
{
Expand Down

0 comments on commit 418518c

Please sign in to comment.