Merge mysql.com:/home/jonas/src/mysql-4.1

into mysql.com:/home/jonas/src/wl1744


ndb/src/ndbapi/ndberror.c:
  Auto merged

2 files changed, 7 insertions, 5 deletions

diff --git a/ndb/tools/ndb_test_platform.cpp b/ndb/tools/ndb_test_platform.cpp
index 2b8bbd0274b..72dd146dacd 100644
--- a/ndb/tools/ndb_test_platform.cpp
+++ b/ndb/tools/ndb_test_platform.cpp
@@ -32,19 +32,21 @@ int test_snprintf(const char * fmt, int buf_sz, int result)
   
   if(ret < 0)
   {
-    printf("BaseString::snprint returns %d\n", ret);
+    printf("BaseString::snprint returns %d with size=%d and strlen(fmt)=%d\n",
+	   ret, buf_sz, strlen(fmt));
     return -1;
   }
   
   if(ret+1 == buf_sz)
   {
-    printf("BaseString::snprint truncates\n");
+    printf("BaseString::snprint truncates returns %d with size=%d and strlen(fmt)=%d\n",
+	   ret, buf_sz, strlen(fmt));
     return -1;
   }
   
   if(ret != result)
   {
-    printf("BaseString::snprint returns incorrect value: %d != %d\n",
+    printf("BaseString::snprint returns incorrect value: returned=%d != expected=%d\n",
 	   ret, result);
     return -1;
   }
@@ -54,7 +56,7 @@ int test_snprintf(const char * fmt, int buf_sz, int result)
     if(buf[ret] != fmt[ret])
     {
       printf("BaseString::snprint Incorrect value in output buffer: "
-	     "%d %d %d %d %d\n",
+	     "size=%d returned=expected=%d at pos=%d result=%d  != expected=%d\n",
              buf_sz, result, ret, buf[ret], fmt[ret]);
       return -1;
     }
diff --git a/ndb/tools/waiter.cpp b/ndb/tools/waiter.cpp
index c9e76bb8ed3..be572d7c275 100644
--- a/ndb/tools/waiter.cpp
+++ b/ndb/tools/waiter.cpp
@@ -86,7 +86,7 @@ int main(int argc, char** argv){
 
   if (_hostName == NULL){
     LocalConfig lcfg;
-    if(!lcfg.init())
+    if(!lcfg.init(opt_connect_str, 0))
     {
       lcfg.printError();
       lcfg.printUsage();