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

into mysql.com:/home/jimw/my/mysql-4.1-clean

Merge mysql.com:/home/jimw/my/mysql-4.1-9947
into mysql.com:/home/jimw/my/mysql-4.1-clean
8e87db93 · jimw@mysql.com · 0b0e4f11 · 9c337163 · 8e87db93
Commit 8e87db93 authored May 02, 2005 by jimw@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/sql_parse.cc sql/sql_parse.cc +1 -1

No files found.
--- 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;