diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-03-27 23:41:02 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-03-27 23:41:02 +0100 |
| commit | 993ea79f2df42292eceeee394e8ece9f4a3f6cf2 (patch) | |
| tree | d105c8288a89a25d412e9006b740c756db6326d6 /sql/innodb_priv.h | |
| parent | 1827d9591e24ee469527021771088d842ab18374 (diff) | |
| parent | 6599fd3e9c23a8957a63146cbe6a0ffc4c292a3d (diff) | |
| download | mariadb-git-993ea79f2df42292eceeee394e8ece9f4a3f6cf2.tar.gz | |
5.5 merge
Diffstat (limited to 'sql/innodb_priv.h')
| -rw-r--r-- | sql/innodb_priv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/innodb_priv.h b/sql/innodb_priv.h index 5406c292b18..24ee848bed1 100644 --- a/sql/innodb_priv.h +++ b/sql/innodb_priv.h @@ -25,7 +25,7 @@ class THD; int get_quote_char_for_identifier(THD *thd, const char *name, uint length); bool schema_table_store_record(THD *thd, TABLE *table); void localtime_to_TIME(MYSQL_TIME *to, struct tm *from); -bool check_global_access(THD *thd, ulong want_access); +bool check_global_access(THD *thd, ulong want_access, bool no_errors=false); uint strconvert(CHARSET_INFO *from_cs, const char *from, CHARSET_INFO *to_cs, char *to, uint to_length, uint *errors); |