Merge mysql.com:/home/stewart/Documents/MySQL/5.0/ndb

into mysql.com:/home/stewart/Documents/MySQL/5.0/ndb-dynamic-port

ndb/docs/wl2077.txt

@@ -13,12 +13,14 @@ wl2077-read hold lock			4.6 (-1%)	6.7 (+ 0%)
 5.0-ndb batch read committed		f) 50' (+680%)	g) 50' (+360%)
 5.0-ndb batch read hold lock		h) 12' (+160%)	i) 13' (+79%)
 
-
--- Comparision e)
-serial pk:	       10.9'
-batched (1000):	       59'
-serial uniq index:     8.4'
-batched (1000):	       33'
+shm-mem	read committed (cmp. wl2077)	a) 9.5' (+48%)	b) 14' (+30%)
+	read hold lock			c) 6.7'	(+45%)	d) 9.8'	(+46%)
+
+-- Comparision e)			shm
+serial pk:	       10.9'		20' (+83%)
+batched (1000):	       59'		62' (+5%)
+serial uniq index:     8.4'		14' (+66%)
+batched (1000):	       33'		36' (+9%)
 index range (1000):    186'
 
 ----
@@ -41,3 +43,6 @@ wl2077			12s		14s
 wl2077 wo/ blobs	1.2s (-30%)	2.5s (-22%)
 
 pekka-blob-fix		1.3s
+
+shm			1.2s		2.0s
+shm wo/ blobs		1.1s		2.0s

ndb/include/transporter/TransporterRegistry.hpp

@@ -87,6 +87,7 @@ public:
  */
 class TransporterRegistry {
   friend class OSE_Receiver;
+  friend class SHM_Transporter;
   friend class Transporter;
   friend class TransporterService;
 public:
@@ -317,6 +318,8 @@ private:
   Uint32 poll_TCP(Uint32 timeOutMillis);
   Uint32 poll_SCI(Uint32 timeOutMillis);
   Uint32 poll_SHM(Uint32 timeOutMillis);
+
+  int m_shm_own_pid;
 };
 
 #endif // Define of TransporterRegistry_H

ndb/src/common/transporter/SHM_Transporter.cpp

@@ -214,7 +214,8 @@ SHM_Transporter::connect_server_impl(NDB_SOCKET_TYPE sockfd)
   }
 
   // Send ok to client
-  s_output.println("shm server 1 ok: %d", g_shm_pid);
+  s_output.println("shm server 1 ok: %d", 
+		   m_transporter_registry.m_shm_own_pid);
   
   // Wait for ok from client
   if (s_input.gets(buf, 256) == 0) 
@@ -293,7 +294,8 @@ SHM_Transporter::connect_client_impl(NDB_SOCKET_TYPE sockfd)
   }
 
   // Send ok to server
-  s_output.println("shm client 1 ok: %d", g_shm_pid);
+  s_output.println("shm client 1 ok: %d", 
+		   m_transporter_registry.m_shm_own_pid);
   
   int r= connect_common(sockfd);
   

ndb/src/common/transporter/TransporterRegistry.cpp

@@ -1275,10 +1275,8 @@ TransporterRegistry::startReceiving()
 #endif
 
 #ifdef NDB_SHM_TRANSPORTER
-  if(nSHMTransporters)
-  {
+  m_shm_own_pid = getpid();
   signal(SIGUSR1, shm_sig_handler);
-  }
 #endif
 }
 

ndb/src/kernel/main.cpp

@@ -51,8 +51,6 @@ void catchsigs(bool ignore); // for process signal handling
 extern "C" void handler_shutdown(int signum);  // for process signal handling
 extern "C" void handler_error(int signum);  // for process signal handling
 
-extern int g_shm_pid;
-
 // Shows system information
 void systemInfo(const Configuration & conf,
 		const LogLevel & ll); 
@@ -142,7 +140,6 @@ int main(int argc, char** argv)
   }
 
   g_eventLogger.info("Angel pid: %d ndb pid: %d", getppid(), getpid());
-  g_shm_pid = getpid();
   theConfig->setupConfiguration();
   systemInfo(* theConfig, * theConfig->m_logLevel); 
   

ndb/src/mgmsrv/ConfigInfo.cpp

@@ -2973,7 +2973,13 @@ fixHostname(InitConfigFileParser::Context & ctx, const char * data){
     require(ctx.m_currentSection->get(buf, &id));
     
     const Properties * node;
-    require(ctx.m_config->get("Node", id, &node));
+    if(!ctx.m_config->get("Node", id, &node))
+    {
+      ctx.reportError("Unknown node: \"%d\" specified in connection "
+		      "[%s] starting at line: %d",
+		      id, ctx.fname, ctx.m_sectionLineno);
+      return false;
+    }
     
     const char * hostname;
     require(node->get("HostName", &hostname));

ndb/src/ndbapi/TransporterFacade.cpp

@@ -450,12 +450,8 @@ runReceiveResponse_C(void * me)
   return me;
 }
 
-extern int g_shm_pid;
-
 void TransporterFacade::threadMainReceive(void)
 {
-  g_shm_pid = getpid();
-  
   theTransporterRegistry->startReceiving();
   NdbMutex_Lock(theMutexPtr);
   theTransporterRegistry->update_connections();