Merge bk-internal:/home/bk/mysql-5.0

into serg.mylan:/usr/home/serg/Abk/mysql-5.0


sql/ha_ndbcluster.cc:
  Auto merged

sql/ha_ndbcluster.cc

@@ -428,7 +428,7 @@ void ha_ndbcluster::invalidateDictionaryCache()
     case(PRIMARY_KEY_ORDERED_INDEX):
     case(ORDERED_INDEX):
       dict->invalidateIndex(index->getName(), m_tabname);
-      break;      
+      break;
     case(UNIQUE_ORDERED_INDEX):
       dict->invalidateIndex(index->getName(), m_tabname);
     case(UNIQUE_INDEX):

sql/sql_parse.cc

@@ -355,11 +355,11 @@ int check_user(THD *thd, enum enum_server_command command,
       if (check_count)
       {
         VOID(pthread_mutex_lock(&LOCK_thread_count));
-        bool count_ok= thread_count < max_connections + delayed_insert_threads
+        bool count_ok= thread_count <= max_connections + delayed_insert_threads
                        || (thd->master_access & SUPER_ACL);
         VOID(pthread_mutex_unlock(&LOCK_thread_count));
         if (!count_ok)
-        {                                         // too many connections 
+        {                                         // too many connections
           net_send_error(thd, ER_CON_COUNT_ERROR);
           DBUG_RETURN(-1);
         }