diff options
| author | jimw@mysql.com <> | 2005-05-02 08:12:27 -0700 |
|---|---|---|
| committer | jimw@mysql.com <> | 2005-05-02 08:12:27 -0700 |
| commit | 8e87db93183b1a4787d7cd0fdd89f1a8179bed68 (patch) | |
| tree | b99eed67e7037c54518ef284ef8ae850664c2a02 | |
| parent | 0b0e4f11664fc539deb5d0d788fb8d8a3a8ecb7e (diff) | |
| parent | 9c33716380c0a88b722c4a7b234ef12bd6cf5830 (diff) | |
| download | mariadb-git-8e87db93183b1a4787d7cd0fdd89f1a8179bed68.tar.gz | |
Merge mysql.com:/home/jimw/my/mysql-4.1-9947
into mysql.com:/home/jimw/my/mysql-4.1-clean
| -rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 49110e02113..c5b429ec8fc 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -449,7 +449,7 @@ static int check_for_max_user_connections(THD *thd, USER_CONN *uc) uc->user_resources.connections <= uc->conn_per_hour) { net_printf(thd, ER_USER_LIMIT_REACHED, uc->user, - "max_connections", + "max_connections_per_hour", (long) uc->user_resources.connections); error=1; goto end; |