Commit 8a7e82ff authored by unknown's avatar unknown
Browse files

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

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


sql/ha_ndbcluster.cc:
  Auto merged
parents 83fa3560 ef46ec41

sql/sql_parse.cc

+2 −2
Original line number Diff line number Diff line
@@ -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)

sql/ha_ndbcluster.cc

+1 −1

File changed.

Contains only whitespace changes.