From e40bf3c40be557687bcd2d318b092ac0ed0275ef Mon Sep 17 00:00:00 2001 From: "serg@serg.mylan" <> Date: Thu, 10 Mar 2005 00:10:10 +0100 Subject: [PATCH] sql/ha_ndbcluster.cc after merge fix sql/sql_parse.cc correct max_connections condition --- sql/ha_ndbcluster.cc | 6 +++--- sql/sql_parse.cc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sql/ha_ndbcluster.cc b/sql/ha_ndbcluster.cc index 03235190cb3..dd0e4f5b022 100644 --- a/sql/ha_ndbcluster.cc +++ b/sql/ha_ndbcluster.cc @@ -416,9 +416,9 @@ void ha_ndbcluster::invalidateDictionaryCache() NDBDICT *dict= get_ndb()->getDictionary(); DBUG_PRINT("info", ("invalidating %s", m_tabname)); dict->invalidateTable(m_tabname); - table->version=0L; /* Free when thread is ready */ + table->s->version=0L; /* Free when thread is ready */ /* Invalidate indexes */ - for (uint i= 0; i < table->keys; i++) + for (uint i= 0; i < table->s->keys; i++) { NDBINDEX *index = (NDBINDEX *) m_index[i].index; NDBINDEX *unique_index = (NDBINDEX *) m_index[i].unique_index; @@ -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): diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 7d3f8899cd5..03e6d91507c 100644 --- a/sql/sql_parse.cc +++ b/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); }