diff options
| author | unknown <dlenev@brandersnatch.localdomain> | 2004-12-31 14:02:40 +0300 |
|---|---|---|
| committer | unknown <dlenev@brandersnatch.localdomain> | 2004-12-31 14:02:40 +0300 |
| commit | da2c2b9c63f977a65153bd5d472b6923a6241a44 (patch) | |
| tree | 9b46c3ec986f993148af5be335f26ccd5afe4a7c /sql/sql_acl.cc | |
| parent | 4ead0873983d177496f1ea1ddce54ace9b4d890d (diff) | |
| download | mariadb-git-da2c2b9c63f977a65153bd5d472b6923a6241a44.tar.gz | |
Yet another after merge fix.
Now max_user_connections is 36th field in mysql.user table
(two new SP-related privileges were added).
Diffstat (limited to 'sql/sql_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index c3229abc6c6..16503c58739 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -348,7 +348,7 @@ my_bool acl_init(THD *org_thd, bool dont_read_acl_tables) user.user_resource.conn_per_hour) mqh_used=1; - if (table->fields >= 34) + if (table->fields >= 36) { /* Starting from 5.0.3 we have max_user_connections 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); if (mqh.specified_limits & USER_RESOURCES::CONNECTIONS_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)) table->field[33]->store((longlong) mqh.user_conn); mqh_used= mqh_used || mqh.questions || mqh.updates || mqh.conn_per_hour; |