mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
sql/ha_ndbcluster.cc
after merge fix
sql/sql_parse.cc
correct max_connections condition
sql/ha_ndbcluster.cc:
after merge fix
sql/sql_parse.cc:
correct max_connections condition
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user