Commit 34f21c86 authored by unknown's avatar unknown
Browse files

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
parents 0dc95fd0 b6a1fe24

mysql-test/t/disabled.def

+0 −2
Original line number Diff line number Diff line
@@ -21,8 +21,6 @@ type_time : Bug#15805 
ps_7ndb         : dbug assert in RBR mode when executing test suite

rpl_ddl         : Bug#15963 SBR does not show "Definer" correctly

events          : Affects flush test case. A table lock not released somewhere

ndb_autodiscover : TBF with CR

ndb_autodiscover2 : TBF with CR

ndb_binlog_basic   : Results are not deterministic, Tomas will fix

rpl_ndb_basic   : Bug#16228

rpl_sp          : Bug #16456

sql/ha_ndbcluster.cc

+4 −4
Original line number Diff line number Diff line
@@ -6199,7 +6199,7 @@ NDB_SHARE *ndbcluster_get_share(const char *key, TABLE *table, 
      DBUG_PRINT("error", ("get_share: %s does not exist", key));

      if (!have_lock)

        pthread_mutex_unlock(&ndbcluster_mutex);

      return 0;

      DBUG_RETURN(0);

    }

    if ((share= (NDB_SHARE*) my_malloc(sizeof(*share),

                                       MYF(MY_WME | MY_ZEROFILL))))
@@ -6221,7 +6221,7 @@ NDB_SHARE *ndbcluster_get_share(const char *key, TABLE *table, 
        *root_ptr= old_root;

        if (!have_lock)

          pthread_mutex_unlock(&ndbcluster_mutex);

        return 0;

        DBUG_RETURN(0);

      }

      thr_lock_init(&share->lock);

      pthread_mutex_init(&share->mutex, MY_MUTEX_INIT_FAST);
@@ -6242,7 +6242,7 @@ NDB_SHARE *ndbcluster_get_share(const char *key, TABLE *table, 
      if (!have_lock)

        pthread_mutex_unlock(&ndbcluster_mutex);

      my_error(ER_OUTOFMEMORY, MYF(0), sizeof(*share));

      return 0;

      DBUG_RETURN(0);

    }

  }

  share->use_count++;
@@ -6258,7 +6258,7 @@ NDB_SHARE *ndbcluster_get_share(const char *key, TABLE *table, 
              share->use_count, share->commit_count));

  if (!have_lock)

    pthread_mutex_unlock(&ndbcluster_mutex);

  return share;

  DBUG_RETURN(share);

}



void ndbcluster_real_free_share(NDB_SHARE **share)