bzr commit into mysql-5.1-telco-7.0 branch (magnus.blaudd:2994)

[Magnus Blåudd]

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

 2994 Magnus Blåudd	2009-09-09 [merge]
      Merge

    renamed:
      mysql-test/std_data/ndb_config_config.ini => mysql-test/suite/ndb/ndb_config_config.ini
      mysql-test/std_data/ndb_config_mycnf1.cnf => mysql-test/suite/ndb/ndb_config_mycnf1.cnf
      mysql-test/std_data/ndb_config_mycnf2.cnf => mysql-test/suite/ndb/ndb_config_mycnf2.cnf
    modified:
      mysql-test/suite/ndb/t/ndb_config.test
      mysql-test/suite/ndb/t/ndb_config2.test
      storage/ndb/src/mgmsrv/ConfigInfo.cpp
      storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
      storage/ndb/src/mgmsrv/main.cpp
      mysql-test/suite/ndb/ndb_config_config.ini
=== renamed file 'mysql-test/std_data/ndb_config_config.ini' => 'mysql-test/suite/ndb/ndb_config_config.ini'
--- a/mysql-test/std_data/ndb_config_config.ini	2009-02-02 10:35:33 +0000
+++ b/mysql-test/suite/ndb/ndb_config_config.ini	2009-08-31 12:59:43 +0000
@@ -1,3 +1,6 @@
+[SYSTEM]
+Name=cluster1
+
 [ndbd default] 
 NoOfReplicas= 2 
 MaxNoOfConcurrentTransactions= 64 

=== renamed file 'mysql-test/std_data/ndb_config_mycnf1.cnf' => 'mysql-test/suite/ndb/ndb_config_mycnf1.cnf'
=== renamed file 'mysql-test/std_data/ndb_config_mycnf2.cnf' => 'mysql-test/suite/ndb/ndb_config_mycnf2.cnf'
=== modified file 'mysql-test/suite/ndb/t/ndb_config.test'
--- a/mysql-test/suite/ndb/t/ndb_config.test	2009-03-20 09:57:27 +0000
+++ b/mysql-test/suite/ndb/t/ndb_config.test	2009-08-31 12:59:43 +0000
@@ -14,31 +14,31 @@ echo == 4 ==;
 --exec $NDB_CONFIG --no-defaults --query=nodeid --type=ndbd --host=localhost 2> /dev/null
 
 echo == 5 ==;
---exec $NDB_CONFIG --no-defaults --query=type,nodeid,host --config-file=$MYSQL_TEST_DIR/std_data/ndb_config_config.ini 2> /dev/null
+--exec $NDB_CONFIG --no-defaults --query=type,nodeid,host --config-file=$MYSQL_TEST_DIR/suite/ndb/ndb_config_config.ini 2> /dev/null
 
 # End of 4.1 tests
 echo == 6 ==;
---exec $NDB_CONFIG --defaults-group-suffix=.jonas --defaults-file=$MYSQL_TEST_DIR/std_data/ndb_config_mycnf1.cnf --query=type,nodeid,host,IndexMemory,DataMemory --mycnf 2> /dev/null
+--exec $NDB_CONFIG --defaults-group-suffix=.jonas --defaults-file=$MYSQL_TEST_DIR/suite/ndb/ndb_config_mycnf1.cnf --query=type,nodeid,host,IndexMemory,DataMemory --mycnf 2> /dev/null
 
 echo == 7 ==;
---exec $NDB_CONFIG --defaults-group-suffix=.cluster0 --defaults-file=$MYSQL_TEST_DIR/std_data/ndb_config_mycnf2.cnf --query=type,nodeid,host --mycnf 2> /dev/null
+--exec $NDB_CONFIG --defaults-group-suffix=.cluster0 --defaults-file=$MYSQL_TEST_DIR/suite/ndb/ndb_config_mycnf2.cnf --query=type,nodeid,host --mycnf 2> /dev/null
 
 echo == 8 ==;
---exec $NDB_CONFIG --defaults-group-suffix=.cluster1 --defaults-file=$MYSQL_TEST_DIR/std_data/ndb_config_mycnf2.cnf --query=type,nodeid,host --mycnf 2> /dev/null
+--exec $NDB_CONFIG --defaults-group-suffix=.cluster1 --defaults-file=$MYSQL_TEST_DIR/suite/ndb/ndb_config_mycnf2.cnf --query=type,nodeid,host --mycnf 2> /dev/null
 
 echo == 9 ==;
---exec $NDB_CONFIG --defaults-group-suffix=.cluster2 --defaults-file=$MYSQL_TEST_DIR/std_data/ndb_config_mycnf2.cnf --query=type,nodeid,host --mycnf 2> /dev/null
+--exec $NDB_CONFIG --defaults-group-suffix=.cluster2 --defaults-file=$MYSQL_TEST_DIR/suite/ndb/ndb_config_mycnf2.cnf --query=type,nodeid,host --mycnf 2> /dev/null
 echo == 10 ==;
---exec $NDB_CONFIG --defaults-group-suffix=.cluster2 --defaults-file=$MYSQL_TEST_DIR/std_data/ndb_config_mycnf2.cnf --connections --query=type,nodeid1,nodeid2,group,nodeidserver --mycnf 2> /dev/null
+--exec $NDB_CONFIG --defaults-group-suffix=.cluster2 --defaults-file=$MYSQL_TEST_DIR/suite/ndb/ndb_config_mycnf2.cnf --connections --query=type,nodeid1,nodeid2,group,nodeidserver --mycnf 2> /dev/null
 
 echo == 11 ==;
---exec $NDB_CONFIG --no-defaults --query=nodeid --host=localhost --config-file=$MYSQL_TEST_DIR/std_data/ndb_config_config.ini 2> /dev/null
+--exec $NDB_CONFIG --no-defaults --query=nodeid --host=localhost --config-file=$MYSQL_TEST_DIR/suite/ndb/ndb_config_config.ini 2> /dev/null
 
 echo == 12 ==;
---exec $NDB_CONFIG --no-defaults --query=nodeid --host=1.2.3.4   --config-file=$MYSQL_TEST_DIR/std_data/ndb_config_config.ini 2> /dev/null
+--exec $NDB_CONFIG --no-defaults --query=nodeid --host=1.2.3.4   --config-file=$MYSQL_TEST_DIR/suite/ndb/ndb_config_config.ini 2> /dev/null
 
 echo == 13 ==;
---exec $NDB_CONFIG --no-defaults --query=nodeid --host=127.0.0.1 --config-file=$MYSQL_TEST_DIR/std_data/ndb_config_config.ini 2> /dev/null
+--exec $NDB_CONFIG --no-defaults --query=nodeid --host=127.0.0.1 --config-file=$MYSQL_TEST_DIR/suite/ndb/ndb_config_config.ini 2> /dev/null
 
 echo == 14 == ndb_config --configinfo;
 --exec $NDB_CONFIG --configinfo > /dev/null

=== modified file 'mysql-test/suite/ndb/t/ndb_config2.test'
--- a/mysql-test/suite/ndb/t/ndb_config2.test	2008-11-27 01:19:14 +0000
+++ b/mysql-test/suite/ndb/t/ndb_config2.test	2009-08-31 12:59:43 +0000
@@ -3,4 +3,4 @@
 
 # Following doesn't work in all configurations (if shm is not defined)
 
---exec $NDB_CONFIG --defaults-group-suffix=.cluster2 --defaults-file=$MYSQL_TEST_DIR/std_data/ndb_config_mycnf2.cnf --connections --query=type,nodeid1,nodeid2,group,nodeidserver --mycnf 2> /dev/null
+--exec $NDB_CONFIG --defaults-group-suffix=.cluster2 --defaults-file=$MYSQL_TEST_DIR/suite/ndb/ndb_config_mycnf2.cnf --connections --query=type,nodeid1,nodeid2,group,nodeidserver --mycnf 2> /dev/null

=== modified file 'storage/ndb/src/mgmsrv/ConfigInfo.cpp'
--- a/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2009-08-24 12:55:54 +0000
+++ b/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2009-08-31 12:59:43 +0000
@@ -3746,6 +3746,8 @@ transformSystem(InitConfigFileParser::Co
   }
 
   BaseString::snprintf(ctx.pname, sizeof(ctx.pname), "SYSTEM_%s", name);
+
+  ctx.m_currentSection->put("Type", ctx.fname);
   
   return true;
 }

=== modified file 'storage/ndb/src/mgmsrv/InitConfigFileParser.cpp'
--- a/storage/ndb/src/mgmsrv/InitConfigFileParser.cpp	2009-06-01 15:58:26 +0000
+++ b/storage/ndb/src/mgmsrv/InitConfigFileParser.cpp	2009-08-25 11:48:09 +0000
@@ -359,7 +359,6 @@ InitConfigFileParser::storeNameValuePair
                       values.c_str());
       return false;
     }
-    ndbout_c("storing enum value %d for %s", value_int, pname);
     require(ctx.m_currentSection->put(pname, value_int));
     break;
   }

=== modified file 'storage/ndb/src/mgmsrv/main.cpp'
--- a/storage/ndb/src/mgmsrv/main.cpp	2009-05-27 15:21:45 +0000
+++ b/storage/ndb/src/mgmsrv/main.cpp	2009-08-25 11:53:32 +0000
@@ -118,6 +118,10 @@ static struct my_option my_long_options[
     (uchar**) &opts.bind_address, (uchar**) &opts.bind_address, 0,
     GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
   { "configdir", 256,
+    "Directory for the binary configuration files (alias for --config-dir)",
+    (uchar**) &opts.configdir, (uchar**) &opts.configdir, 0,
+    GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
+  { "config-dir", 256,
     "Directory for the binary configuration files",
     (uchar**) &opts.configdir, (uchar**) &opts.configdir, 0,
     GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },

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