database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

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

Browse Source 
Fix for SHOW GRANTS statement.
This commit is contained in:
Alexey Botchkov
2016-01-27 12:39:27 +04:00
parent f3926cd18e
commit 552d33095a
4 changed files with 52 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sql/sql_acl.cc
View File

@ -7740,6 +7740,16 @@ static int show_grants_callback(ACL_USER_BASE *role, void *data)
}
void mysql_show_grants_get_fields(THD *thd, List<Item> *fields,
const char *name)
{
Item_string *field=new (thd->mem_root) Item_string_ascii(thd, "", 0);
field->name= (char *) name;
field->max_length=1024;
fields->push_back(field, thd->mem_root);
}
/*
SHOW GRANTS; Send grants for a user to the client
@ -7805,15 +7815,14 @@ bool mysql_show_grants(THD *thd, LEX_USER *lex_user)
}
DBUG_ASSERT(rolename || username);
Item_string *field=new (thd->mem_root) Item_string_ascii(thd, "", 0);
List<Item> field_list;
field->name=buff;
field->max_length=1024;
if (!username)
strxmov(buff,"Grants for ",rolename, NullS);
else
strxmov(buff,"Grants for ",username,"@",hostname, NullS);
field_list.push_back(field, thd->mem_root);
mysql_show_grants_get_fields(thd, &field_list, buff);
if (protocol->send_result_set_metadata(&field_list,
Protocol::SEND_NUM_ROWS |
Protocol::SEND_EOF))