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

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

Merge bk-internal:/home/bk/mysql-5.0
into serg.mylan:/usr/home/serg/Abk/mysql-5.0
e272ab97 · serg@serg.mylan · db4ca33f · e40bf3c4 · e272ab97 · e272ab97
Commit e272ab97 authored Mar 10, 2005 by serg@serg.mylan
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

sql/ha_ndbcluster.cc sql/ha_ndbcluster.cc +1 -1

sql/sql_parse.cc sql/sql_parse.cc +2 -2

No files found.
--- a/sql/ha_ndbcluster.cc
+++ b/sql/ha_ndbcluster.cc
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -355,7 +355,7 @@ 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)