List:Commits« Previous MessageNext Message »
From:jonas oreland Date:August 30 2011 10:01am
Subject:bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4485 to 4487)
View as plain text  
 4487 jonas oreland	2011-08-30
      ndb - remove hard-coded block-juggling when selecting which block to send STOP_FOR_CRASH to...Just use first in block-list (that now exists)

    modified:
      storage/ndb/src/kernel/vm/mt.cpp
 4486 jonas oreland	2011-08-30
      ndb - add new config parameter for unified thread-config

    modified:
      storage/ndb/include/mgmapi/mgmapi_config_parameters.h
 4485 Mauritz Sundell	2011-08-28
      Regenerated (again) test result fro ndb_statistics1 with notes.
      
      Wrong result committed - stupid me.
      
      Three query plans changed but is equally good as the previous.
      A test related to bug #59519 seems broken even before the
      previus commit. The query plan should have >1 row in last join.
      
      In the same query the index for (I,J) should be choosen but
      in this case the resulting index (J,K) is equally good.

    modified:
      mysql-test/suite/ndb/r/ndb_statistics1.result
=== modified file 'storage/ndb/include/mgmapi/mgmapi_config_parameters.h'
--- a/storage/ndb/include/mgmapi/mgmapi_config_parameters.h	2011-07-04 13:37:56 +0000
+++ b/storage/ndb/include/mgmapi/mgmapi_config_parameters.h	2011-08-30 09:40:52 +0000
@@ -195,6 +195,7 @@
 #define CFG_DB_INDEX_STAT_UPDATE_DELAY   626
 
 #define CFG_DB_MAX_DML_OPERATIONS_PER_TRANSACTION 627
+#define CFG_DB_MT_THREAD_CONFIG          628
 
 #define CFG_NODE_ARBIT_RANK           200
 #define CFG_NODE_ARBIT_DELAY          201

=== modified file 'storage/ndb/src/kernel/vm/mt.cpp'
--- a/storage/ndb/src/kernel/vm/mt.cpp	2011-08-27 06:06:02 +0000
+++ b/storage/ndb/src/kernel/vm/mt.cpp	2011-08-30 10:00:48 +0000
@@ -3251,28 +3251,11 @@ sendprioa_STOP_FOR_CRASH(const struct th
   */
   static thr_job_buffer dummy_buffer;
 
-  /*
-   * Before we had three main threads with fixed block assignment.
-   * Now there is also worker instances (we send to LQH instance).
+  /**
+   * Pick any instance running in this thread
    */
-  Uint32 main = 0;
-  Uint32 instance = 0;
-  if (dst == 0)
-    main = NDBCNTR;
-  else if (dst == 1)
-    main = DBLQH;
-  else if (dst >= NUM_MAIN_THREADS && dst < NUM_MAIN_THREADS + num_lqh_threads)
-  {
-    main = DBLQH;
-    instance = dst - NUM_MAIN_THREADS + 1;
-  }
-  else if (dst == receiver_thread_no)
-    main = CMVMI;
-  else
-    require(false);
-  Uint32 bno = numberToBlock(main, instance);
-  require(block2ThreadId(main, instance) == dst);
   struct thr_data * dstptr = rep->m_thread + dst;
+  Uint32 bno = dstptr->m_instance_list[0];
 
   memset(&signalT.header, 0, sizeof(SignalHeader));
   signalT.header.theVerId_signalNumber   = GSN_STOP_FOR_CRASH;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4485 to 4487) jonas oreland30 Aug