Commit 9f5a4955 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-4.1-9947 

into mysql.com:/home/jimw/my/mysql-4.1-clean
parents 5df9135b 8c0f1e89

sql/sql_parse.cc

+1 −1
Original line number Diff line number Diff line
@@ -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;