diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-10-06 11:29:44 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2010-10-06 11:29:44 +0200 |
| commit | 38194bf7a5d4927f8adeddc5e00bf4feab08114f (patch) | |
| tree | b33dfb00e00ec3f4473c088305871021f437ee46 /sql/sql_connect.h | |
| parent | 623ed1946215e25682847ac3b0ea066cab35ea59 (diff) | |
| parent | 052c9e392e6d9b770511c88cfec05ef606bff2ed (diff) | |
| download | mariadb-git-38194bf7a5d4927f8adeddc5e00bf4feab08114f.tar.gz | |
Merge from mysql-5.5-bugteam to mysql-5.5-runtime.
Diffstat (limited to 'sql/sql_connect.h')
| -rw-r--r-- | sql/sql_connect.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_connect.h b/sql/sql_connect.h index bfcc04ba093..666db4c6462 100644 --- a/sql/sql_connect.h +++ b/sql/sql_connect.h @@ -43,5 +43,8 @@ int check_user(THD *thd, enum enum_server_command command, bool login_connection(THD *thd); void prepare_new_connection_state(THD* thd); void end_connection(THD *thd); +int get_or_create_user_conn(THD *thd, const char *user, + const char *host, const USER_RESOURCES *mqh); +int check_for_max_user_connections(THD *thd, USER_CONN *uc); #endif /* SQL_CONNECT_INCLUDED */ |