bk commit into 5.0 tree (stewart:1.2587)

[Stewart Smith]

Below is the list of changes that have just been committed into a local
5.0 repository of stewart.  When stewart 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@stripped, 2008-03-28 14:59:23+11:00, stewart@willster.(none) +6 -0
  fix warning introduced earlier (my bad)
  
  WL4012 ndb on win32

  ndb/tools/desc.cpp@stripped, 2008-03-28 14:59:19+11:00, stewart@willster.(none) +3 -2
    fix warning

  ndb/tools/drop_index.cpp@stripped, 2008-03-28 14:59:19+11:00, stewart@willster.(none) +4 -2
    fix warning

  ndb/tools/drop_tab.cpp@stripped, 2008-03-28 14:59:19+11:00, stewart@willster.(none) +4 -2
    fix warning

  ndb/tools/listTables.cpp@stripped, 2008-03-28 14:59:20+11:00, stewart@willster.(none) +2 -1
    fix warning

  ndb/tools/select_all.cpp@stripped, 2008-03-28 14:59:20+11:00, stewart@willster.(none) +4 -2
    fix warning

  ndb/tools/select_count.cpp@stripped, 2008-03-28 14:59:20+11:00, stewart@willster.(none) +4 -2
    fix warning

diff -Nrup a/ndb/tools/desc.cpp b/ndb/tools/desc.cpp
--- a/ndb/tools/desc.cpp	2008-03-12 18:45:03 +11:00
+++ b/ndb/tools/desc.cpp	2008-03-28 14:59:19 +11:00
@@ -22,9 +22,9 @@ static const char* _dbname = "TEST_DB";
 static int _unqualified = 0;
 static int _partinfo = 0;
 
-extern "C" const char *load_default_groups[]= { "mysql_cluster",0 };
+extern "C" { const char *load_default_groups[]= { "mysql_cluster",0 }; }
 
-extern "C" struct my_option my_long_options[] =
+extern "C" { struct my_option my_long_options[] =
 {
   NDB_STD_OPTS("ndb_desc"),
   { "database", 'd', "Name of database table is in",
@@ -38,6 +38,7 @@ extern "C" struct my_option my_long_opti
     GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 }, 
   { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
+}
 
 static void print_part_info(Ndb* pNdb, NDBT_Table* pTab);
 
diff -Nrup a/ndb/tools/drop_index.cpp b/ndb/tools/drop_index.cpp
--- a/ndb/tools/drop_index.cpp	2008-03-12 18:45:03 +11:00
+++ b/ndb/tools/drop_index.cpp	2008-03-28 14:59:19 +11:00
@@ -22,9 +22,9 @@
 
 static const char* _dbname = "TEST_DB";
 
-extern "C" const char *load_default_groups[]= { "mysql_cluster",0 };
+extern "C" { const char *load_default_groups[]= { "mysql_cluster",0 }; }
 
-extern "C" struct my_option my_long_options[] =
+extern "C" { struct my_option my_long_options[] =
 {
   NDB_STD_OPTS("ndb_desc"),
   { "database", 'd', "Name of database table is in",
@@ -32,6 +32,8 @@ extern "C" struct my_option my_long_opti
     GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
   { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
+}
+
 static void usage()
 {
 #ifdef NOT_USED
diff -Nrup a/ndb/tools/drop_tab.cpp b/ndb/tools/drop_tab.cpp
--- a/ndb/tools/drop_tab.cpp	2008-03-12 18:45:03 +11:00
+++ b/ndb/tools/drop_tab.cpp	2008-03-28 14:59:19 +11:00
@@ -22,9 +22,9 @@
 
 static const char* _dbname = "TEST_DB";
 
-extern "C" const char *load_default_groups[]= { "mysql_cluster",0 };
+extern "C" { const char *load_default_groups[]= { "mysql_cluster",0 }; }
 
-extern "C" struct my_option my_long_options[] =
+extern "C" { struct my_option my_long_options[] =
 {
   NDB_STD_OPTS("ndb_desc"),
   { "database", 'd', "Name of database table is in",
@@ -32,6 +32,8 @@ extern "C" struct my_option my_long_opti
     GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
   { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
+}
+
 static void usage()
 {
 #ifdef NOT_USED
diff -Nrup a/ndb/tools/listTables.cpp b/ndb/tools/listTables.cpp
--- a/ndb/tools/listTables.cpp	2008-03-12 18:45:03 +11:00
+++ b/ndb/tools/listTables.cpp	2008-03-28 14:59:20 +11:00
@@ -169,7 +169,7 @@ static const char* _dbname = "TEST_DB";
 static int _loops;
 static int _type;
 
-extern "C" struct my_option my_long_options[] =
+extern "C" { struct my_option my_long_options[] =
 {
   NDB_STD_OPTS("ndb_show_tables"),
   { "database", 'd', "Name of database table is in",
@@ -186,6 +186,7 @@ extern "C" struct my_option my_long_opti
     GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0 }, 
   { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
+}
 
 int main(int argc, char** argv){
   NDB_INIT(argv[0]);
diff -Nrup a/ndb/tools/select_all.cpp b/ndb/tools/select_all.cpp
--- a/ndb/tools/select_all.cpp	2008-03-12 18:45:04 +11:00
+++ b/ndb/tools/select_all.cpp	2008-03-28 14:59:20 +11:00
@@ -40,9 +40,9 @@ static const char* _delimiter = "\t";
 static int _header, _parallelism, _useHexFormat, _lock,
   _order, _descending;
 
-extern "C" const char *load_default_groups[]= { "mysql_cluster",0 };
+extern "C" { const char *load_default_groups[]= { "mysql_cluster",0 }; }
 
-extern "C" struct my_option my_long_options[] =
+extern "C" { struct my_option my_long_options[] =
 {
   NDB_STD_OPTS("ndb_desc"),
   { "database", 'd', "Name of database table is in",
@@ -71,6 +71,8 @@ extern "C" struct my_option my_long_opti
     GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
   { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
+}
+
 static void usage()
 {
 #ifdef NOT_USED
diff -Nrup a/ndb/tools/select_count.cpp b/ndb/tools/select_count.cpp
--- a/ndb/tools/select_count.cpp	2008-03-26 15:24:51 +11:00
+++ b/ndb/tools/select_count.cpp	2008-03-28 14:59:20 +11:00
@@ -35,9 +35,9 @@ static const char* _dbname = "TEST_DB";
 static int _parallelism = 240;
 static int _lock = 0;
 
-extern "C" const char *load_default_groups[]= { "mysql_cluster",0 };
+extern "C" { const char *load_default_groups[]= { "mysql_cluster",0 }; }
 
-extern "C" struct my_option my_long_options[] =
+extern "C" { struct my_option my_long_options[] =
 {
   NDB_STD_OPTS("ndb_desc"),
   { "database", 'd', "Name of database table is in",
@@ -51,6 +51,8 @@ extern "C" struct my_option my_long_opti
     GET_INT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 }, 
   { 0, 0, 0, 0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0}
 };
+}
+
 static void usage()
 {
 #ifdef NOT_USED