diff options
| author | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2008-12-24 18:47:24 +0400 |
|---|---|---|
| committer | Sergey Glukhov <Sergey.Glukhov@sun.com> | 2008-12-24 18:47:24 +0400 |
| commit | 853f4ba37b8434576bdb7d0b13d81573eaaa8742 (patch) | |
| tree | ea858040f1f8c243bc43c5fa35e277b854ade209 /sql/sql_acl.cc | |
| parent | e6b9fb32a7923169b4dffcf3e9ba4c5700428137 (diff) | |
| parent | 4794f463b6e4b14eea3656df14753ab23611afaf (diff) | |
| download | mariadb-git-853f4ba37b8434576bdb7d0b13d81573eaaa8742.tar.gz | |
5.0-bugteam->5.1-bugteam merge
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 3af8bc9d779..bd940608a07 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -6304,6 +6304,7 @@ int wild_case_compare(CHARSET_INFO *cs, const char *str,const char *wildstr) } +#ifndef NO_EMBEDDED_ACCESS_CHECKS static bool update_schema_privilege(THD *thd, TABLE *table, char *buff, const char* db, const char* t_name, const char* column, uint col_length, @@ -6324,6 +6325,7 @@ static bool update_schema_privilege(THD *thd, TABLE *table, char *buff, table->field[i]->store(is_grantable, strlen(is_grantable), cs); return schema_table_store_record(thd, table); } +#endif int fill_schema_user_privileges(THD *thd, TABLE_LIST *tables, COND *cond) |