List:Commits« Previous MessageNext Message »
From:jack andrews Date:April 15 2009 12:36pm
Subject:bzr push into mysql-5.1-telco-7.0 branch (jack:2866 to 2867)
View as plain text  
 2867 jack andrews	2009-04-15
      typo in kernel/main.cpp   --initial-start

    modified:
      storage/ndb/src/kernel/main.cpp
 2866 U-asus\jack	2009-04-15 [merge]
      merge down

    removed:
      mysql-test/suite/ndb/r/add_node04.result
      mysql-test/suite/ndb/r/add_node05.result
      mysql-test/suite/ndb/r/add_node06.result
      mysql-test/suite/ndb/r/add_node09.result
      mysql-test/suite/ndb/r/add_node10.result
      mysql-test/suite/ndb/r/add_node14.result
      mysql-test/suite/ndb/r/add_node15.result
      mysql-test/suite/ndb/r/add_node_dd01.result
      mysql-test/suite/ndb/r/add_node_dd02.result
      mysql-test/suite/ndb/r/add_node_dd03.result
      mysql-test/suite/ndb/r/add_node_dd04.result
      mysql-test/suite/ndb/r/add_node_dd05.result
      mysql-test/suite/ndb/r/add_node_dd07.result
      mysql-test/suite/ndb/r/add_node_mix.result
      mysql-test/suite/ndb/r/ndb_restore_compressed.result
      mysql-test/suite/ndb/t/add_node04.test
      mysql-test/suite/ndb/t/add_node05.test
      mysql-test/suite/ndb/t/add_node06.test
      mysql-test/suite/ndb/t/add_node09.test
      mysql-test/suite/ndb/t/add_node10.test
      mysql-test/suite/ndb/t/add_node14.test
      mysql-test/suite/ndb/t/add_node15.test
      mysql-test/suite/ndb/t/add_node_dd01.test
      mysql-test/suite/ndb/t/add_node_dd02.test
      mysql-test/suite/ndb/t/add_node_dd03.test
      mysql-test/suite/ndb/t/add_node_dd04.test
      mysql-test/suite/ndb/t/add_node_dd05.test
      mysql-test/suite/ndb/t/add_node_dd07.test
      mysql-test/suite/ndb/t/add_node_mix.test
      storage/ndb/src/ndbapi/signal-sender/
    added:
      mysql-test/include/ndb_init_scan_counts.inc
      mysql-test/include/ndb_scan_counts.inc
      mysql-test/suite/ndb/r/ndb_restore_options.result
      mysql-test/suite/ndb/std_data/table_data10000.dat
      mysql-test/suite/ndb/t/ndb_restore_compressed-master.opt
      mysql-test/suite/ndb/t/ndb_restore_options.test
      mysql-test/suite/rpl_ndb/r/rpl_ndb_check_for_mixed.result
      mysql-test/suite/rpl_ndb/t/rpl_ndb_check_for_mixed.test
    renamed:
      storage/ndb/src/ndbapi/ndberror_check.c => storage/ndb/src/ndbapi/ndberror_check.cpp
    modified:
      configure.in
      mysql-test/include/restart_mysqld.inc
      mysql-test/suite/funcs_1/r/innodb_storedproc_08.result
      mysql-test/suite/funcs_1/r/is_columns_is_embedded.result
      mysql-test/suite/funcs_1/r/is_columns_myisam_embedded.result
      mysql-test/suite/funcs_1/r/is_columns_mysql_embedded.result
      mysql-test/suite/funcs_1/r/is_statistics_mysql_embedded.result
      mysql-test/suite/funcs_1/r/memory_storedproc_08.result
      mysql-test/suite/funcs_1/r/myisam_storedproc_08.result
      mysql-test/suite/funcs_1/r/ndb_storedproc_08.result
      mysql-test/suite/funcs_1/r/storedproc.result
      mysql-test/suite/ndb/r/add_node01.result
      mysql-test/suite/ndb/r/add_node02.result
      mysql-test/suite/ndb/r/add_node03.result
      mysql-test/suite/ndb/r/ndb_basic.result
      mysql-test/suite/ndb/r/ndb_load.result
      mysql-test/suite/ndb/r/ndb_partition_hash.result
      mysql-test/suite/ndb/r/ndb_partition_key.result
      mysql-test/suite/ndb/r/ndb_partition_list.result
      mysql-test/suite/ndb/r/ndb_partition_range.result
      mysql-test/suite/ndb/r/ndb_restore.result
      mysql-test/suite/ndb/r/ndb_restore_print.result
      mysql-test/suite/ndb/t/add_node01.test
      mysql-test/suite/ndb/t/add_node02.test
      mysql-test/suite/ndb/t/add_node03.test
      mysql-test/suite/ndb/t/disabled.def
      mysql-test/suite/ndb/t/ndb_load.test
      mysql-test/suite/ndb/t/ndb_partition_hash.test
      mysql-test/suite/ndb/t/ndb_partition_key.test
      mysql-test/suite/ndb/t/ndb_partition_list.test
      mysql-test/suite/ndb/t/ndb_partition_range.test
      mysql-test/suite/ndb/t/ndb_restore.test
      mysql-test/suite/ndb/t/ndb_restore_print.test
      mysql-test/suite/ndb_team/t/ndb_autodiscover3.test
      sql/ha_ndbcluster.cc
      sql/ha_ndbcluster.h
      storage/ndb/include/mgmapi/mgmapi_error.h
      storage/ndb/include/mgmcommon/ConfigRetriever.hpp
      storage/ndb/include/ndbapi/NdbScanOperation.hpp
      storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp
      storage/ndb/src/common/portlib/NdbThread.c
      storage/ndb/src/kernel/blocks/backup/Backup.cpp
      storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp
      storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
      storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
      storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp
      storage/ndb/src/kernel/blocks/dbtup/DbtupProxy.cpp
      storage/ndb/src/kernel/blocks/lgman.cpp
      storage/ndb/src/kernel/blocks/lgman.hpp
      storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
      storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
      storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp
      storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
      storage/ndb/src/kernel/blocks/suma/Suma.cpp
      storage/ndb/src/kernel/ndbd.cpp
      storage/ndb/src/kernel/vm/Configuration.cpp
      storage/ndb/src/kernel/vm/Configuration.hpp
      storage/ndb/src/kernel/vm/mt.cpp
      storage/ndb/src/mgmapi/mgmapi.cpp
      storage/ndb/src/mgmapi/mgmapi_error.c
      storage/ndb/src/mgmapi/mgmapi_internal.h
      storage/ndb/src/mgmsrv/Config.cpp
      storage/ndb/src/mgmsrv/Config.hpp
      storage/ndb/src/mgmsrv/ConfigManager.cpp
      storage/ndb/src/mgmsrv/ConfigManager.hpp
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
      storage/ndb/src/mgmsrv/MgmtSrvr.hpp
      storage/ndb/src/mgmsrv/Services.cpp
      storage/ndb/src/ndbapi/Makefile.am
      storage/ndb/src/ndbapi/NdbBlob.cpp
      storage/ndb/src/ndbapi/NdbDictionary.cpp
      storage/ndb/src/ndbapi/NdbRecAttr.cpp
      storage/ndb/src/ndbapi/SignalSender.cpp
      storage/ndb/src/ndbapi/SignalSender.hpp
      storage/ndb/src/ndbapi/ndb_cluster_connection.cpp
      storage/ndb/src/ndbapi/ndberror.c
      storage/ndb/test/ndbapi/testBackup.cpp
      storage/ndb/test/ndbapi/testMgm.cpp
      storage/ndb/test/ndbapi/testNdbApi.cpp
      storage/ndb/test/ndbapi/testNodeRestart.cpp
      storage/ndb/test/run-test/check-tests.sh
      storage/ndb/test/run-test/daily-basic-tests.txt
      storage/ndb/test/run-test/daily-devel-tests.txt
      storage/ndb/tools/restore/Restore.cpp
      storage/ndb/tools/restore/Restore.hpp
      storage/ndb/src/ndbapi/ndberror_check.cpp
=== modified file 'storage/ndb/src/kernel/main.cpp'
--- a/storage/ndb/src/kernel/main.cpp	2009-04-09 03:46:22 +0000
+++ b/storage/ndb/src/kernel/main.cpp	2009-04-15 12:34:27 +0000
@@ -72,7 +72,7 @@ static struct my_option my_long_options[
     GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
   { "initial-start", 256,
     "Perform a partial initial start of the cluster.  "
-    "Each node should be started with this option, as well as --nowait-nodes"
+    "Each node should be started with this option, as well as --nowait-nodes",
     (uchar**) &opt_initialstart, (uchar**) &opt_initialstart, 0,
     GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 },
   { "bind-address", 256,


Attachment: [text/bzr-bundle] bzr/jack@sun.com-20090415123427-wpiwcfjt97qsc6w3.bundle
Thread
bzr push into mysql-5.1-telco-7.0 branch (jack:2866 to 2867)jack andrews15 Apr