summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-05-02 08:12:27 -0700
committerunknown <jimw@mysql.com>2005-05-02 08:12:27 -0700
commit9f5a4955d0ccfd27f5338c04e17e5fabd3840616 (patch)
treeb99eed67e7037c54518ef284ef8ae850664c2a02
parent5df9135be7772221a79a2e9440d8e9b80bb7798c (diff)
parent8c0f1e89c0c68b07c9e065c7e3ae409f5d963243 (diff)
downloadmariadb-git-9f5a4955d0ccfd27f5338c04e17e5fabd3840616.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.cc2
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;