database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

sql/ha_ndbcluster.cc

Browse Source 
after merge fix
sql/sql_parse.cc
    correct max_connections condition
This commit is contained in:
serg@serg.mylan
2005-03-10 00:10:10 +01:00
parent 3b0e983bf0
commit e40bf3c40b
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/ha_ndbcluster.cc
View File

@ -416,9 +416,9 @@ void ha_ndbcluster::invalidateDictionaryCache()
NDBDICT *dict= get_ndb()->getDictionary(); NDBDICT *dict= get_ndb()->getDictionary();
DBUG_PRINT("info", ("invalidating %s", m_tabname)); DBUG_PRINT("info", ("invalidating %s", m_tabname));
dict->invalidateTable(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 */ /* 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 *index = (NDBINDEX *) m_index[i].index;
NDBINDEX *unique_index = (NDBINDEX *) m_index[i].unique_index; NDBINDEX *unique_index = (NDBINDEX *) m_index[i].unique_index;
@ -428,7 +428,7 @@ void ha_ndbcluster::invalidateDictionaryCache()
case(PRIMARY_KEY_ORDERED_INDEX): case(PRIMARY_KEY_ORDERED_INDEX):
case(ORDERED_INDEX): case(ORDERED_INDEX):
dict->invalidateIndex(index->getName(), m_tabname); dict->invalidateIndex(index->getName(), m_tabname);
break; break;
case(UNIQUE_ORDERED_INDEX): case(UNIQUE_ORDERED_INDEX):
dict->invalidateIndex(index->getName(), m_tabname); dict->invalidateIndex(index->getName(), m_tabname);
case(UNIQUE_INDEX): case(UNIQUE_INDEX):

4
sql/sql_parse.cc
View File

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