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

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

Browse Source 
Keep the embedded-server version valid.
This commit is contained in:
Alexey Botchkov
2016-01-27 16:42:42 +04:00
parent d16d40be2c
commit 418518c0b1
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sql_prepare.cc
View File

@ -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)
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)
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)
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)
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)
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)))
{ {