Commit eb248128 authored by Nikita Malyavin's avatar Nikita Malyavin Committed by Oleksandr Byelkin

sql_show: Fix narrowing conversion from the get_column_grant return result.

parent 8a882827
...@@ -7097,7 +7097,7 @@ static int get_schema_stat_record(THD *thd, TABLE_LIST *tables, ...@@ -7097,7 +7097,7 @@ static int get_schema_stat_record(THD *thd, TABLE_LIST *tables,
uint j; uint j;
for (j=0 ; j < key_info->user_defined_key_parts ; j++,key_part++) for (j=0 ; j < key_info->user_defined_key_parts ; j++,key_part++)
{ {
uint access= get_column_grant(thd, &tables->grant, db_name->str, auto access= get_column_grant(thd, &tables->grant, db_name->str,
table_name->str, table_name->str,
key_part->field->field_name.str); key_part->field->field_name.str);
...@@ -7659,7 +7659,7 @@ static int get_schema_key_column_usage_record(THD *thd, TABLE_LIST *tables, ...@@ -7659,7 +7659,7 @@ static int get_schema_key_column_usage_record(THD *thd, TABLE_LIST *tables,
uint j; uint j;
for (j=0 ; j < key_info->user_defined_key_parts ; j++,key_part++) for (j=0 ; j < key_info->user_defined_key_parts ; j++,key_part++)
{ {
uint access= get_column_grant(thd, &tables->grant, db_name->str, auto access= get_column_grant(thd, &tables->grant, db_name->str,
table_name->str, table_name->str,
key_part->field->field_name.str); key_part->field->field_name.str);
...@@ -7702,7 +7702,7 @@ static int get_schema_key_column_usage_record(THD *thd, TABLE_LIST *tables, ...@@ -7702,7 +7702,7 @@ static int get_schema_key_column_usage_record(THD *thd, TABLE_LIST *tables,
{ {
while ((r_info= it1++)) while ((r_info= it1++))
{ {
uint access= get_column_grant(thd, &tables->grant, db_name->str, auto access= get_column_grant(thd, &tables->grant, db_name->str,
table_name->str, r_info->str); table_name->str, r_info->str);
if (!access) if (!access)
......
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