Commit a1355f91 authored by unknown's avatar unknown

Fix for embedded server to compile


sql/sql_show.cc:
  operations with grant_tables should be #ifdef-ed
parent 2b18eedc
...@@ -2317,9 +2317,6 @@ static int get_schema_column_record(THD *thd, struct st_table_list *tables, ...@@ -2317,9 +2317,6 @@ static int get_schema_column_record(THD *thd, struct st_table_list *tables,
end=strmov(end,grant_types.type_names[bitnr]); end=strmov(end,grant_types.type_names[bitnr]);
} }
} }
#else
*end= 0;
#endif
if (tables->schema_table) // any user has 'select' privilege on all if (tables->schema_table) // any user has 'select' privilege on all
// I_S table columns // I_S table columns
table->field[17]->store(grant_types.type_names[0], table->field[17]->store(grant_types.type_names[0],
...@@ -2327,6 +2324,9 @@ static int get_schema_column_record(THD *thd, struct st_table_list *tables, ...@@ -2327,6 +2324,9 @@ static int get_schema_column_record(THD *thd, struct st_table_list *tables,
else else
table->field[17]->store(tmp+1,end == tmp ? 0 : (uint) (end-tmp-1), cs); table->field[17]->store(tmp+1,end == tmp ? 0 : (uint) (end-tmp-1), cs);
#else
*end= 0;
#endif
table->field[1]->store(base_name, strlen(base_name), cs); table->field[1]->store(base_name, strlen(base_name), cs);
table->field[2]->store(file_name, strlen(file_name), cs); table->field[2]->store(file_name, strlen(file_name), cs);
table->field[3]->store(field->field_name, strlen(field->field_name), table->field[3]->store(field->field_name, strlen(field->field_name),
......
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