1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Yet another after merge fix.

Browse Source 
Now max_user_connections is 36th field in mysql.user table
(two new SP-related privileges were added).
This commit is contained in:
unknown 2004-12-31 14:02:40 +03:00
parent 4ead087398
commit da2c2b9c63
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_acl.cc
View File

@ -348,7 +348,7 @@ my_bool acl_init(THD *org_thd, bool dont_read_acl_tables)
user.user_resource.conn_per_hour) user.user_resource.conn_per_hour)
mqh_used=1; mqh_used=1;
if (table->fields >= 34) if (table->fields >= 36)
{ {
/* Starting from 5.0.3 we have max_user_connections field */ /* Starting from 5.0.3 we have max_user_connections field */
ptr= get_field(&mem, table->field[next_field++]); ptr= get_field(&mem, table->field[next_field++]);
@ -1702,7 +1702,7 @@ static int replace_user_table(THD *thd, TABLE *table, const LEX_USER &combo,
table->field[29]->store((longlong) mqh.updates); table->field[29]->store((longlong) mqh.updates);
if (mqh.specified_limits & USER_RESOURCES::CONNECTIONS_PER_HOUR) if (mqh.specified_limits & USER_RESOURCES::CONNECTIONS_PER_HOUR)
table->field[30]->store((longlong) mqh.conn_per_hour); table->field[30]->store((longlong) mqh.conn_per_hour);
if (table->fields >= 34 && if (table->fields >= 36 &&
(mqh.specified_limits & USER_RESOURCES::USER_CONNECTIONS)) (mqh.specified_limits & USER_RESOURCES::USER_CONNECTIONS))
table->field[33]->store((longlong) mqh.user_conn); table->field[33]->store((longlong) mqh.user_conn);
mqh_used= mqh_used || mqh.questions || mqh.updates || mqh.conn_per_hour; mqh_used= mqh_used || mqh.questions || mqh.updates || mqh.conn_per_hour;