Commit c87cfbaf authored by unknown's avatar unknown
Browse files

Removed faulty impl. 


sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/ha_ndbcluster.cc:
  Removed this change, it will be modified later anyway
parents 4f6e9741 87636012

ndb/src/kernel/blocks/dbacc/DbaccMain.cpp

+2 −4
Original line number Diff line number Diff line
@@ -2449,14 +2449,14 @@ void Dbacc::execACC_COMMITREQ(Signal* signal) 
  operationRecPtr.p->transactionstate = IDLE;

  operationRecPtr.p->operation = ZUNDEFINED_OP;

  if(Toperation != ZREAD){

    rootfragrecptr.i = fragrecptr.p->myroot;

    ptrCheckGuard(rootfragrecptr, crootfragmentsize, rootfragmentrec);

    rootfragrecptr.p->m_commit_count++;

    if (Toperation != ZINSERT) {

      if (Toperation != ZDELETE) {

	return;

      } else {

	jam();

	rootfragrecptr.i = fragrecptr.p->myroot;

	ptrCheckGuard(rootfragrecptr, crootfragmentsize, rootfragmentrec);

	rootfragrecptr.p->noOfElements--;

	fragrecptr.p->slack += operationRecPtr.p->insertDeleteLen;

	if (fragrecptr.p->slack > fragrecptr.p->slackCheck) {
@@ -2476,8 +2476,6 @@ void Dbacc::execACC_COMMITREQ(Signal* signal) 
      }//if

    } else {

      jam();  /* EXPAND PROCESS HANDLING */

      rootfragrecptr.i = fragrecptr.p->myroot;

      ptrCheckGuard(rootfragrecptr, crootfragmentsize, rootfragmentrec);

      rootfragrecptr.p->noOfElements++;

      fragrecptr.p->slack -= operationRecPtr.p->insertDeleteLen;

      if (fragrecptr.p->slack >= (1u << 31)) {

sql/ha_ndbcluster.cc

+2 −1
Original line number Diff line number Diff line
@@ -5675,7 +5675,7 @@ extern "C" pthread_handler_decl(ndb_util_thread_func, 
  }



  List<NDB_SHARE> util_open_tables;

  set_timespec(abstime, ndb_cache_check_time);

  set_timespec(abstime, 0);

  for (;;)

  {
@@ -5693,6 +5693,7 @@ extern "C" pthread_handler_decl(ndb_util_thread_func, 


    if (ndb_cache_check_time == 0)

    {

      /* Wake up in 10 seconds to check if value has changed */

      set_timespec(abstime, 10);

      continue;

    }

sql/sql_class.h

+0 −1
Original line number Diff line number Diff line
@@ -1131,7 +1131,6 @@ class THD :public ilink, 
  table_map  used_tables;

  USER_CONN *user_connect;

  CHARSET_INFO *db_charset;

  List<TABLE> temporary_tables_should_be_free; // list of temporary tables

  /*

    FIXME: this, and some other variables like 'count_cuted_fields'

    maybe should be statement/cursor local, that is, moved to Statement