summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <holyfoot@hf-ibm.(none)>2005-05-07 20:25:59 +0500
committerunknown <holyfoot@hf-ibm.(none)>2005-05-07 20:25:59 +0500
commita1355f91bbbadde04db6ed8ca8e3298e2cd8f45b (patch)
tree8ffd5ea51e8a1dc893959bd80311bcfc7a115ff1 /sql
parent2b18eedc6de935ce3608744c881e53c6e4eee762 (diff)
downloadmariadb-git-a1355f91bbbadde04db6ed8ca8e3298e2cd8f45b.tar.gz
Fix for embedded server to compile
sql/sql_show.cc: operations with grant_tables should be #ifdef-ed
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_show.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc
index a90756e38db..9e3f82f9fd6 100644
--- a/sql/sql_show.cc
+++ b/sql/sql_show.cc
@@ -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]);
}
}
-#else
- *end= 0;
-#endif
if (tables->schema_table) // any user has 'select' privilege on all
// I_S table columns
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,
else
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[2]->store(file_name, strlen(file_name), cs);
table->field[3]->store(field->field_name, strlen(field->field_name),