bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:3110) Bug#47941

[Magnus Blåudd]

#At file:///home/msvensson/mysql/7.0/ based on revid:magnus.blaudd@strippedwyam44t9cs

 3110 Magnus Blåudd	2009-10-09
      Bug #47941  	configure --with-ndb-port-base=port broken and should be removed
       - Print warning if --with-ndb-port-base is used, it has not effect
       - Since ndb_global.h.in does not have any "substs" anymore, move it to ndb_global.h
       - Remove the last remnants of NDB_TCP_PORT_BASE usage from ConfigInfo.cpp, dead code.

    renamed:
      storage/ndb/include/ndb_global.h.in => storage/ndb/include/ndb_global.h
    modified:
      config/ac-macros/ha_ndbcluster.m4
      storage/ndb/include/CMakeLists.txt
      storage/ndb/src/mgmapi/LocalConfig.cpp
      storage/ndb/src/mgmsrv/ConfigInfo.cpp
      storage/ndb/include/ndb_global.h
=== modified file 'config/ac-macros/ha_ndbcluster.m4'
--- a/config/ac-macros/ha_ndbcluster.m4	2009-10-09 13:33:51 +0000
+++ b/config/ac-macros/ha_ndbcluster.m4	2009-10-09 14:12:17 +0000
@@ -147,9 +147,13 @@ AC_DEFUN([MYSQL_CHECK_NDB_OPTIONS], [
 
   AC_ARG_WITH([ndb-port-base],
               [AC_HELP_STRING([--with-ndb-port-base],
-                              [Base port for NDB Cluster transporters])],
-              [ndb_port_base="$withval"],
-              [ndb_port_base="default"])
+                              [Deprecated option])],
+              [ndb_port_base="$withval"], [])
+  if test "$ndb_port_base"
+  then
+     AC_MSG_WARN([Ignoring deprecated option --with-ndb-port-base])
+  fi
+
   AC_ARG_WITH([ndb-debug],
               [AC_HELP_STRING([--without-ndb-debug],
                               [Disable special ndb debug features])],
@@ -471,7 +475,6 @@ AC_DEFUN([MYSQL_SETUP_NDBCLUSTER], [
 
   AC_CONFIG_FILES([
    storage/ndb/include/ndb_version.h
-   storage/ndb/include/ndb_global.h
    storage/ndb/include/ndb_types.h
   ])
 ])

=== modified file 'storage/ndb/include/CMakeLists.txt'
--- a/storage/ndb/include/CMakeLists.txt	2009-10-02 16:13:41 +0000
+++ b/storage/ndb/include/CMakeLists.txt	2009-10-09 14:12:17 +0000
@@ -73,12 +73,3 @@ CONFIGURE_FILE(ndb_version.h.in
                ${CMAKE_CURRENT_SOURCE_DIR}/ndb_version.h
                @ONLY)
 
-#
-# Create ndb_global.h
-#
-SET(ndb_port "1186" CACHE STRING "Port for NDB Cluster management server")
-SET(ndb_port_base "default" CACHE STRING "Base port for NDB Cluster transporters")
-CONFIGURE_FILE(ndb_global.h.in
-               ${CMAKE_CURRENT_SOURCE_DIR}/ndb_global.h
-               @ONLY)
-

=== renamed file 'storage/ndb/include/ndb_global.h.in' => 'storage/ndb/include/ndb_global.h'
--- a/storage/ndb/include/ndb_global.h.in	2009-10-09 13:33:51 +0000
+++ b/storage/ndb/include/ndb_global.h	2009-10-09 14:12:17 +0000
@@ -1,5 +1,6 @@
 /*
-   Copyright (C) 2003 MySQL AB
+   Copyright (C) 2003 MySQL AB, 2009 Sun Microsystems, Inc.
+
     All rights reserved. Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
@@ -28,8 +29,6 @@
 #define NDB_PORT 1186
 #endif
 
-#define NDB_TCP_BASE_PORT "@ndb_port_base@"
-
 #if defined(_WIN32) || defined(_WIN64) || defined(__WIN32__) || defined(WIN32)
 #define NDB_WIN32 1
 #define NDB_WIN 1

=== modified file 'storage/ndb/src/mgmapi/LocalConfig.cpp'
--- a/storage/ndb/src/mgmapi/LocalConfig.cpp	2009-10-09 13:33:51 +0000
+++ b/storage/ndb/src/mgmapi/LocalConfig.cpp	2009-10-09 14:12:17 +0000
@@ -102,7 +102,7 @@ LocalConfig::init(const char *connectStr
   {
     if(readConnectString("host=localhost:" STR_VALUE(NDB_PORT),
                          "default connect string"))
-      DBUG_RETURN(true);
+      return true;
   }
 
   setError(0, "");

=== modified file 'storage/ndb/src/mgmsrv/ConfigInfo.cpp'
--- a/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2009-10-09 13:33:51 +0000
+++ b/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2009-10-09 14:12:17 +0000
@@ -4087,15 +4087,6 @@ fixPortNumber(InitConfigFileParser::Cont
 	ctx.m_userProperties.get(server_port_adder.c_str(), &adder);
 	ctx.m_userProperties.put(server_port_adder.c_str(), adder+1, true);
       }
-      
-      if (!ctx.m_userProperties.get("ServerPortBase", &base)){
-	if(!(ctx.m_userDefaults &&
-	   ctx.m_userDefaults->get("PortNumber", &base)) &&
-	   !ctx.m_systemDefaults->get("PortNumber", &base)) {
-	  base= (Uint32)strtoll(NDB_TCP_BASE_PORT,0,0);
-	}
-	ctx.m_userProperties.put("ServerPortBase", base);
-      }
 
       port= base + adder;
       ctx.m_userProperties.put("ServerPort_", id1, port);

Attachment: [text/bzr-bundle] bzr/[e-mail]