mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-11966: Impossible to execute prepared ANALYZE SELECT

Browse source 
Prepare os ANALYZE now respond as EXPLAIN.
This commit is contained in:
Oleksandr Byelkin 2017-02-02 12:09:49 +01:00
parent 5ff6694d70
commit 24cbc8dae3
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sql/sql_prepare.cc
View file

@ -1591,7 +1591,7 @@ static int mysql_test_select(Prepared_statement *stmt,
*/
if (unit->prepare(thd, 0, 0))
goto error;
if (!lex->describe && !stmt->is_sql_prepare())
if (!lex->describe && !thd->lex->analyze_stmt && !stmt->is_sql_prepare())
{
/* Make copy of item list, as change_columns may change it */
List<Item> fields(lex->select_lex.item_list);

20
tests/mysql_client_test.c
View file

@ -19460,6 +19460,25 @@ static void test_big_packet()
}
/* Test simple prepares of all DML statements */
static void test_prepare_analyze()
{
MYSQL_STMT *stmt;
int rc;
myheader("test_prepare_analyze");
stmt= mysql_stmt_init(mysql);
check_stmt(stmt);
rc= mysql_stmt_prepare(stmt, "ANALYZE SELECT 1", -1);
check_execute(stmt, rc);
verify_param_count(stmt, 0);
rc= mysql_stmt_execute(stmt);
check_execute(stmt, rc);
mysql_stmt_close(stmt);
}
static struct my_tests_st my_tests[]= {
{ "disable_query_logs", disable_query_logs },
{ "test_view_sp_list_fields", test_view_sp_list_fields },
@ -19733,6 +19752,7 @@ static struct my_tests_st my_tests[]= {
{ "test_ps_sp_out_params", test_ps_sp_out_params },
{ "test_compressed_protocol", test_compressed_protocol },
{ "test_big_packet", test_big_packet },
{ "test_prepare_analyze", test_prepare_analyze },
{ 0, 0 }
};