Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1

4 files changed, 21 insertions, 12 deletions

diff --git a/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp b/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp
index afde88c47a2..8677ae741b3 100644
--- a/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp
+++ b/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp
@@ -172,7 +172,7 @@ Dbtux::execTUX_BOUND_INFO(Signal* signal)
       BoundInfo& b = boundInfo[j][attrId];
       if (b.type != -1) {
         // compare with previous bound
-        if (b.type != type2 ||
+        if (b.type != (int)type2 ||
             b.size != 2 + dataSize ||
             memcmp(&data[b.offset + 2], &data[offset + 2], dataSize << 2) != 0) {
           jam();
diff --git a/ndb/src/mgmsrv/MgmtSrvr.cpp b/ndb/src/mgmsrv/MgmtSrvr.cpp
index 83f349bd435..f03b324ecfe 100644
--- a/ndb/src/mgmsrv/MgmtSrvr.cpp
+++ b/ndb/src/mgmsrv/MgmtSrvr.cpp
@@ -1656,7 +1656,10 @@ MgmtSrvr::setSignalLoggingMode(int processId, LogMode mode,
     logSpec = TestOrd::InputOutputSignals;
     break;
   default:
-    assert("Unexpected value, MgmtSrvr::setSignalLoggingMode" == 0);
+    ndbout_c("Unexpected value %d, MgmtSrvr::setSignalLoggingMode, line %d",
+	     (unsigned)mode, __LINE__);
+    assert(false);
+    return -1;
   }
 
   NdbApiSignal* signal = getSignal();
diff --git a/ndb/src/mgmsrv/main.cpp b/ndb/src/mgmsrv/main.cpp
index 51282416c24..5ee48e4cfcc 100644
--- a/ndb/src/mgmsrv/main.cpp
+++ b/ndb/src/mgmsrv/main.cpp
@@ -104,24 +104,25 @@ const char *debug_option= 0;
 
 struct getargs args[] = {
   { "version", 'v', arg_flag, &_print_version,
-    "Print ndb_mgmd version"},
+    "Print ndb_mgmd version",""},
   { "config-file", 'c', arg_string, &glob.config_filename,
-    "Specify cluster configuration file (will default use config.ini if available)", "filename" },
+    "Specify cluster configuration file (default config.ini if available)",
+    "filename"},
 #ifndef DBUG_OFF
   { "debug", 0, arg_string, &debug_option,
-    "Specify debug options e.g. d:t:i:o,out.trace", "options" },
+    "Specify debug options e.g. d:t:i:o,out.trace", "options"},
 #endif
   { "daemon", 'd', arg_flag, &glob.daemon,
-    "Run ndb_mgmd in daemon mode (default)" },
+    "Run ndb_mgmd in daemon mode (default)",""},
   { NULL, 'l', arg_string, &glob.local_config_filename,
-    "Specify configuration file connect string (will default use Ndb.cfg if available)",
-    "filename" },
+    "Specify configuration file connect string (default Ndb.cfg if available)",
+    "filename"},
   { "interactive", 0, arg_flag, &glob.interactive,
-   "Run interactive. Not supported but provided for testing purposes", "" },
+   "Run interactive. Not supported but provided for testing purposes", ""},
   { "no-nodeid-checks", 0, arg_flag, &g_no_nodeid_checks,
-    "Do not provide any node id checks", "" },
+    "Do not provide any node id checks", ""},
   { "nodaemon", 0, arg_flag, &glob.non_interactive,
-    "Don't run as daemon, but don't read from stdin", "non-interactive" }
+    "Don't run as daemon, but don't read from stdin", "non-interactive"}
 };
 
 int num_args = sizeof(args) / sizeof(args[0]);
diff --git a/ndb/tools/select_all.cpp b/ndb/tools/select_all.cpp
index 8fb8437ba5f..9f8108d9f32 100644
--- a/ndb/tools/select_all.cpp
+++ b/ndb/tools/select_all.cpp
@@ -116,6 +116,11 @@ int main(int argc, const char** argv){
     ndbout << " Table " << _tabname << " does not exist!" << endl;
     return NDBT_ProgramExit(NDBT_WRONGARGS);
   }
+  
+  if(_order && pIdx == NULL){
+    ndbout << " Order flag given without an index" << endl;
+    return NDBT_ProgramExit(NDBT_WRONGARGS);
+  }
 
   if (scanReadRecords(&MyNdb, 
 		      pTab, 
@@ -146,7 +151,7 @@ int scanReadRecords(Ndb* pNdb,
   int                  check;
   NdbConnection	       *pTrans;
   NdbScanOperation	       *pOp;
-  NdbIndexScanOperation * pIOp;
+  NdbIndexScanOperation * pIOp= 0;
 
   NDBT_ResultRow * row = new NDBT_ResultRow(*pTab, delimiter);