database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fix for a user management system that resources can be reset to zero

Browse Source 
with a GRANT statement.
This commit is contained in:
Sinisa@sinisa.nasamreza.org
2002-06-25 21:20:10 +03:00
parent 66e1777a3e
commit d0cea95f49
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_acl.cc
View File

@ -652,11 +652,11 @@ static void acl_update_user(const char *user, const char *host,
acl_user->host.hostname && !strcmp(host,acl_user->host.hostname)) acl_user->host.hostname && !strcmp(host,acl_user->host.hostname))
{ {
acl_user->access=privileges; acl_user->access=privileges;
if (mqh->questions) if (mqh->bits & 1)
acl_user->user_resource.questions=mqh->questions; acl_user->user_resource.questions=mqh->questions;
if (mqh->updates) if (mqh->bits & 2)
acl_user->user_resource.updates=mqh->updates; acl_user->user_resource.updates=mqh->updates;
if (mqh->connections) if (mqh->bits & 4)
acl_user->user_resource.connections=mqh->connections; acl_user->user_resource.connections=mqh->connections;
#ifdef HAVE_OPENSSL #ifdef HAVE_OPENSSL
acl_user->ssl_type=ssl_type; acl_user->ssl_type=ssl_type;
@ -1300,11 +1300,11 @@ static int replace_user_table(THD *thd, TABLE *table, const LEX_USER &combo,
#endif /* HAVE_OPENSSL */ #endif /* HAVE_OPENSSL */
USER_RESOURCES mqh = thd->lex.mqh; USER_RESOURCES mqh = thd->lex.mqh;
if (mqh.questions) if (mqh.bits & 1)
table->field[28]->store((longlong) mqh.questions); table->field[28]->store((longlong) mqh.questions);
if (mqh.updates) if (mqh.bits & 2)
table->field[29]->store((longlong) mqh.updates); table->field[29]->store((longlong) mqh.updates);
if (mqh.connections) if (mqh.bits & 4)
table->field[30]->store((longlong) mqh.connections); table->field[30]->store((longlong) mqh.connections);
mqh_used = mqh_used || mqh.questions || mqh.updates || mqh.connections; mqh_used = mqh_used || mqh.questions || mqh.updates || mqh.connections;
} }

2
sql/sql_parse.cc
View File

@ -392,7 +392,7 @@ static void reset_mqh(THD *thd, LEX_USER *lu, bool get_them=false)
if (lu) // for GRANT if (lu) // for GRANT
{ {
USER_CONN *uc; USER_CONN *uc;
volatile uint temp_len=lu->user.length+lu->host.length+2; uint temp_len=lu->user.length+lu->host.length+2;
char temp_user[USERNAME_LENGTH+HOSTNAME_LENGTH+2]; char temp_user[USERNAME_LENGTH+HOSTNAME_LENGTH+2];
memcpy(temp_user,lu->user.str,lu->user.length); memcpy(temp_user,lu->user.str,lu->user.length);

3
sql/sql_yacc.yy
View File

@ -3669,14 +3669,17 @@ grant_option:
| MAX_QUERIES_PER_HOUR ULONG_NUM | MAX_QUERIES_PER_HOUR ULONG_NUM
{ {
Lex->mqh.questions=$2; Lex->mqh.questions=$2;
Lex->mqh.bits |= 1;
} }
| MAX_UPDATES_PER_HOUR ULONG_NUM | MAX_UPDATES_PER_HOUR ULONG_NUM
{ {
Lex->mqh.updates=$2; Lex->mqh.updates=$2;
Lex->mqh.bits |= 2;
} }
| MAX_CONNECTIONS_PER_HOUR ULONG_NUM | MAX_CONNECTIONS_PER_HOUR ULONG_NUM
{ {
Lex->mqh.connections=$2; Lex->mqh.connections=$2;
Lex->mqh.bits |= 4;
}; };
begin: begin:

2
sql/structs.h
View File

@ -163,7 +163,7 @@ typedef struct st_lex_user {
typedef struct user_resources { typedef struct user_resources {
uint questions, updates, connections; uint questions, updates, connections, bits;
} USER_RESOURCES; } USER_RESOURCES;
typedef struct user_conn { typedef struct user_conn {