diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-08-16 15:51:40 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-08-16 15:51:40 +0300 |
| commit | 2dfd946fd4eaba1632eb9a98bb047a4fe3afbedd (patch) | |
| tree | 9e2129be0d36d6d157a26e783f07de8eb7b52bd2 /sql/mysql_priv.h | |
| parent | fb135f7ee570a199d78db7c3222db1980b75060f (diff) | |
| parent | cea27d300236436cfc0a0fca6c0993c3867be8f6 (diff) | |
| download | mariadb-git-2dfd946fd4eaba1632eb9a98bb047a4fe3afbedd.tar.gz | |
Automatic merge with 5.2
Diffstat (limited to 'sql/mysql_priv.h')
| -rw-r--r-- | sql/mysql_priv.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/mysql_priv.h b/sql/mysql_priv.h index 24e637df497..b38253c866a 100644 --- a/sql/mysql_priv.h +++ b/sql/mysql_priv.h @@ -943,6 +943,7 @@ inline bool check_merge_table_access(THD *thd, char *db, TABLE_LIST *table_list) inline bool check_some_routine_access(THD *thd, const char *db, const char *name, bool is_proc) { return false; } +#define decrease_user_connections(X) do { } while(0) /* nothing */ #endif /*NO_EMBEDDED_ACCESS_CHECKS*/ bool multi_update_precheck(THD *thd, TABLE_LIST *tables); @@ -1176,7 +1177,9 @@ bool init_new_connection_handler_thread(); void reset_mqh(LEX_USER *lu, bool get_them); bool check_mqh(THD *thd, uint check_command); void time_out_user_resource_limits(THD *thd, USER_CONN *uc); +#ifndef NO_EMBEDDED_ACCESS_CHECKS void decrease_user_connections(USER_CONN *uc); +#endif bool thd_init_client_charset(THD *thd, uint cs_number); inline bool is_supported_parser_charset(CHARSET_INFO *cs) { |