bk commit into 5.1 tree (tomas:1.1917)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1917 05/10/07 09:29:55 tomas@stripped +9 -0
  merge

  storage/ndb/src/mgmsrv/MgmtSrvr.cpp
    1.86 05/10/07 09:29:45 tomas@stripped +0 -2
    merge

  storage/ndb/src/kernel/blocks/suma/SumaInit.cpp
    1.10 05/10/07 09:29:45 tomas@stripped +0 -60
    merge

  storage/ndb/src/kernel/blocks/suma/Suma.cpp
    1.25 05/10/07 09:29:45 tomas@stripped +35 -15
    merge

  storage/ndb/include/mgmapi/ndbd_exit_codes.h
    1.7 05/10/07 01:50:18 tomas@stripped +0 -0
    Rename: storage/ndb/include/ndbd_exit_codes.h ->
storage/ndb/include/mgmapi/ndbd_exit_codes.h

  storage/ndb/test/sql/test_range_bounds.pl
    1.2 05/10/07 01:28:42 tomas@stripped +0 -0
    Rename: ndb/test/sql/test_range_bounds.pl ->
storage/ndb/test/sql/test_range_bounds.pl

  storage/ndb/test/sql/test_create_drop.pl
    1.2 05/10/07 01:28:41 tomas@stripped +0 -0
    Rename: ndb/test/sql/test_create_drop.pl ->
storage/ndb/test/sql/test_create_drop.pl

  storage/ndb/src/kernel/vm/ndbd_malloc.hpp
    1.2 05/10/07 01:28:19 tomas@stripped +0 -0
    Rename: ndb/src/kernel/vm/ndbd_malloc.hpp ->
storage/ndb/src/kernel/vm/ndbd_malloc.hpp

  storage/ndb/src/kernel/vm/ndbd_malloc.cpp
    1.2 05/10/07 01:28:17 tomas@stripped +0 -0
    Rename: ndb/src/kernel/vm/ndbd_malloc.cpp ->
storage/ndb/src/kernel/vm/ndbd_malloc.cpp

  storage/ndb/src/kernel/error/ndbd_exit_codes.c
    1.5 05/10/07 01:27:54 tomas@stripped +0 -0
    Rename: ndb/src/kernel/error/ndbd_exit_codes.c ->
storage/ndb/src/kernel/error/ndbd_exit_codes.c

  storage/ndb/include/ndbd_exit_codes.h
    1.6 05/10/07 01:27:28 tomas@stripped +0 -0
    Rename: ndb/include/mgmapi/ndbd_exit_codes.h ->
storage/ndb/include/ndbd_exit_codes.h

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1

--- 1.24/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2005-10-07 01:06:20 +02:00
+++ 1.25/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2005-10-07 09:29:45 +02:00
@@ -162,23 +162,25 @@
   ndbrequire(p != 0);
 
   // SumaParticipant
-  Uint32 noTables;
+  Uint32 noTables, noAttrs;
   ndb_mgm_get_int_parameter(p, CFG_DB_NO_TABLES,  
 			    &noTables);
+  ndb_mgm_get_int_parameter(p, CFG_DB_NO_ATTRIBUTES,  
+			    &noAttrs);
 
-  /**
-   * @todo: fix pool sizes
-   */
-  c_tablePool_.setSize(noTables);
+  c_tablePool.setSize(noTables);
   c_tables.setSize(noTables);
   
-  c_subscriptions.setSize(20); //10
-  c_subscriberPool.setSize(64);
+  c_subscriptions.setSize(noTables);
+  c_subscriberPool.setSize(2*noTables);
   
-  c_subscriptionPool.setSize(64); //2
-  c_syncPool.setSize(20); //2
-  c_dataBufferPool.setSize(128);
+  c_subscriptionPool.setSize(noTables);
+  c_syncPool.setSize(2);
+  c_dataBufferPool.setSize(noAttrs);
+  c_gcp_pool.setSize(10);
   
+  c_page_chunk_pool.setSize(50);
+
   {
     SLList<SyncRecord> tmp(c_syncPool);
     Ptr<SyncRecord> ptr;
@@ -188,15 +190,33 @@
   }
 
   // Suma
-  c_nodePool.setSize(MAX_NDB_NODES);
   c_masterNodeId = getOwnNodeId();
 
-  c_nodeGroup = c_noNodesInGroup = c_idInNodeGroup = 0;
+  c_nodeGroup = c_noNodesInGroup = 0;
   for (int i = 0; i < MAX_REPLICAS; i++) {
     c_nodesInGroup[i]   = 0;
   }
 
-  c_subCoordinatorPool.setSize(10);
+  m_first_free_page= RNIL;
+  
+  memset(c_buckets, 0, sizeof(c_buckets));
+  for(Uint32 i = 0; i<NO_OF_BUCKETS; i++)
+  {
+    Bucket* bucket= c_buckets+i;
+    bucket->m_buffer_tail = RNIL;
+    bucket->m_buffer_head.m_page_id = RNIL;
+    bucket->m_buffer_head.m_page_pos = Buffer_page::DATA_WORDS;
+  }
+  
+  m_max_seen_gci = 0;      // FIRE_TRIG_ORD
+  m_max_sent_gci = 0;      // FIRE_TRIG_ORD -> send
+  m_last_complete_gci = 0; // SUB_GCP_COMPLETE_REP
+  m_gcp_complete_rep_count = 0;
+  m_out_of_buffer_gci = 0;
+ 
+  c_startup.m_wait_handover= false; 
+  c_failedApiNodes.clear();
+  c_startup.m_restart_server_node_id = 0; // Server for my NR
 
   ReadConfigConf * conf = (ReadConfigConf*)signal->getDataPtrSend();
   conf->senderRef = reference();
@@ -695,7 +715,7 @@
 	} 
 	else if(state & Bucket::BUCKET_STARTING)
 	{
-	  progError(__LINE__, ERR_SYSTEM_ERROR, 
+	  progError(__LINE__, NDBD_EXIT_SYSTEM_ERROR, 
 		    "Nodefailure during SUMA takeover");
 	}
       }
@@ -4326,7 +4346,7 @@
   
   if(m_out_of_buffer_gci)
   {
-    progError(__LINE__, ERR_SYSTEM_ERROR, 
+    progError(__LINE__, NDBD_EXIT_SYSTEM_ERROR, 
 	      "Nodefailure while out of event buffer");
     return;
   }

--- 1.9/storage/ndb/src/kernel/blocks/suma/SumaInit.cpp	2005-10-07 01:10:11 +02:00
+++ 1.10/storage/ndb/src/kernel/blocks/suma/SumaInit.cpp	2005-10-07 09:29:45 +02:00
@@ -28,13 +28,6 @@
   Restart(*this),
   c_gcp_list(c_gcp_pool)
 {
-  c_masterNodeId = getOwnNodeId();
-
-  c_no_of_buckets = c_nodeGroup = c_noNodesInGroup = 0;
-  for (int i = 0; i < MAX_REPLICAS; i++) {
-    c_nodesInGroup[i] = 0;
-  }
-  
   // Add received signals
   addRecSignal(GSN_READ_CONFIG_REQ, &Suma::execREAD_CONFIG_REQ);
   addRecSignal(GSN_STTOR, &Suma::execSTTOR);
@@ -128,59 +121,6 @@
   
   addRecSignal(GSN_SUB_GCP_COMPLETE_REP, 
 	       &Suma::execSUB_GCP_COMPLETE_REP);
-  
-  /**
-   * @todo: fix pool sizes
-   */
-  Uint32 noTables, noAttrs;
-  const ndb_mgm_configuration_iterator * p = conf.getOwnConfigIterator();
-  ndbrequire(p != 0);
-
-  ndb_mgm_get_int_parameter(p, CFG_DB_NO_TABLES,  
-			    &noTables);
-  ndb_mgm_get_int_parameter(p, CFG_DB_NO_ATTRIBUTES,  
-			    &noAttrs);
-
-  c_tablePool.setSize(noTables);
-  c_tables.setSize(noTables);
-  
-  c_subscriptions.setSize(noTables);
-  c_subscriberPool.setSize(2*noTables);
-  
-  c_subscriptionPool.setSize(noTables);
-  c_syncPool.setSize(2);
-  c_dataBufferPool.setSize(noAttrs);
-  c_gcp_pool.setSize(10);
-
-  m_first_free_page= RNIL;
-  c_page_chunk_pool.setSize(50);
-  
-  {
-    SLList<SyncRecord> tmp(c_syncPool);
-    Ptr<SyncRecord> ptr;
-    while(tmp.seize(ptr))
-      new (ptr.p) SyncRecord(* this, c_dataBufferPool);
-    tmp.release();
-  }
-
-  memset(c_buckets, 0, sizeof(c_buckets));
-  for(Uint32 i = 0; i<NO_OF_BUCKETS; i++)
-  {
-    Bucket* bucket= c_buckets+i;
-    bucket->m_buffer_tail = RNIL;
-    bucket->m_buffer_head.m_page_id = RNIL;
-    bucket->m_buffer_head.m_page_pos = Buffer_page::DATA_WORDS;
-  }
-  
-  m_max_seen_gci = 0;      // FIRE_TRIG_ORD
-  m_max_sent_gci = 0;      // FIRE_TRIG_ORD -> send
-  m_last_complete_gci = 0; // SUB_GCP_COMPLETE_REP
-  m_gcp_complete_rep_count = 0;
-  m_out_of_buffer_gci = 0;
- 
-  c_startup.m_wait_handover= false; 
-  c_failedApiNodes.clear();
-  c_startup.m_restart_server_node_id = 0; // Server for my NR
 }
 
 Suma::~Suma()

--- 1.85/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2005-10-07 01:12:21 +02:00
+++ 1.86/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2005-10-07 09:29:45 +02:00
@@ -1969,8 +1969,6 @@
   
   NodeId nodeId = eventReport->getNodeId();
   Ndb_logevent_type type = eventReport->getEventType();
-  Uint32 nodeId= eventReport->getNodeId();
-
   // Log event
   g_eventLogger.log(type, theData, nodeId, 
 		    &m_event_listner[0].m_logLevel);