sql/ha_ndbcluster.cc

    after merge fix
sql/sql_parse.cc
    correct max_connections condition

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;

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)