bk commit into 4.1 tree (jimw:1.2318) BUG#9947

[Jim Winstead]

Below is the list of changes that have just been committed into a local
4.1 repository of jimw. When jimw does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2318 05/06/27 18:03:14 jimw@stripped +1 -0
  Fix max_connections_per_hour handling when the global
  max_user_connections is also set. (Bug #9947)

  sql/sql_parse.cc
    1.448 05/06/27 18:03:10 jimw@stripped +10 -12
    Don't cap max_connections_per_hour to the global max_user_connections,
    since the latter is a limit of concurrent connections. Also, count
    number of concurrent connections for a user correctly, instead of
    starting at 2.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-4.1-9947

--- 1.447/sql/sql_parse.cc	2005-06-23 10:01:38 -07:00
+++ 1.448/sql/sql_parse.cc	2005-06-27 18:03:10 -07:00
@@ -136,7 +136,7 @@
 				   const char *host,
 				   USER_RESOURCES *mqh)
 {
-  int return_val=0;
+  int return_val= 0;
   uint temp_len, user_len;
   char temp_user[USERNAME_LENGTH+HOSTNAME_LENGTH+2];
   struct  user_conn *uc;
@@ -144,7 +144,7 @@
   DBUG_ASSERT(user != 0);
   DBUG_ASSERT(host != 0);
 
-  user_len=strlen(user);
+  user_len= strlen(user);
   temp_len= (strmov(strmov(temp_user, user)+1, host) - temp_user)+1;
   (void) pthread_mutex_lock(&LOCK_user_conn);
   if (!(uc = (struct  user_conn *) hash_search(&hash_user_connections,
@@ -156,25 +156,23 @@
 			 MYF(MY_WME)))))
     {
       send_error(thd, 0, NullS);		// Out of memory
-      return_val=1;
+      return_val= 1;
       goto end;
     }
     uc->user=(char*) (uc+1);
     memcpy(uc->user,temp_user,temp_len+1);
     uc->user_len= user_len;
-    uc->host=uc->user + uc->user_len +  1;
-    uc->len = temp_len;
-    uc->connections = 1;
-    uc->questions=uc->updates=uc->conn_per_hour=0;
-    uc->user_resources=*mqh;
-    if (max_user_connections && mqh->connections > max_user_connections)
-      uc->user_resources.connections = max_user_connections;
-    uc->intime=thd->thr_create_time;
+    uc->host= uc->user + uc->user_len +  1;
+    uc->len= temp_len;
+    uc->connections= 0;
+    uc->questions= uc->updates= uc->conn_per_hour=0;
+    uc->user_resources= *mqh;
+    uc->intime= thd->thr_create_time;
     if (my_hash_insert(&hash_user_connections, (byte*) uc))
     {
       my_free((char*) uc,0);
       send_error(thd, 0, NullS);		// Out of memory
-      return_val=1;
+      return_val= 1;
       goto end;
     }
   }