bzr commit into mysql-5.1 branch (jonas:2781)

[Jonas Oreland]

#At file:///home/jonas/src/telco-6.2/

 2781 Jonas Oreland	2008-12-16
      ndb - autotest misc fixes
modified:
  storage/ndb/test/ndbapi/testBasic.cpp
  storage/ndb/test/run-test/autotest-boot.sh
  storage/ndb/test/run-test/daily-basic-tests.txt
  storage/ndb/test/run-test/db.cpp

=== modified file 'storage/ndb/test/ndbapi/testBasic.cpp'
--- a/storage/ndb/test/ndbapi/testBasic.cpp	2007-10-15 08:09:00 +0000
+++ b/storage/ndb/test/ndbapi/testBasic.cpp	2008-12-16 17:12:00 +0000
@@ -1796,9 +1796,7 @@ TESTCASE("InsertError2", "" ){
 }
 TESTCASE("Fill", 
 	 "Verify what happens when we fill the db" ){
-  INITIALIZER(runFillTable);
-  INITIALIZER(runPkRead);
-  FINALIZER(runClearTable2);
+  STEP(runFillTable);
 }
 TESTCASE("Bug25090", 
 	 "Verify what happens when we fill the db" ){

=== modified file 'storage/ndb/test/run-test/autotest-boot.sh'
--- a/storage/ndb/test/run-test/autotest-boot.sh	2008-12-11 13:47:52 +0000
+++ b/storage/ndb/test/run-test/autotest-boot.sh	2008-12-16 17:12:00 +0000
@@ -226,7 +226,7 @@ if [ "$build" ]
 then
     rm -rf $dst_place0
 
-    if [ "$dst_place1" ]
+    if [ "$clone1" ]
     then
 	rm -rf $dst_place1
     fi

=== modified file 'storage/ndb/test/run-test/daily-basic-tests.txt'
--- a/storage/ndb/test/run-test/daily-basic-tests.txt	2008-12-15 19:35:37 +0000
+++ b/storage/ndb/test/run-test/daily-basic-tests.txt	2008-12-16 17:12:00 +0000
@@ -1163,7 +1163,7 @@ args: -l 100 -n Bug37158
 # EOF 2008-06-03
 max-time: 500
 cmd: test_event
-args -n bug37672 T1
+args: -n bug37672 T1
 
 #EOF 2008-07-04
 max-time: 500
@@ -1173,10 +1173,10 @@ args: 
 #EOF 2008-07-09
 max-time: 600
 cmd: test_event
-args -r 5000 -n Bug30780 T1
+args: -r 5000 -n Bug30780 T1
 
 #EOF 2008-08-11
 max-time: 1200
 cmd: testNodeRestart
-args -n Bug41295 T1
+args: -n Bug41295 T1
 

=== modified file 'storage/ndb/test/run-test/db.cpp'
--- a/storage/ndb/test/run-test/db.cpp	2008-11-10 11:41:44 +0000
+++ b/storage/ndb/test/run-test/db.cpp	2008-12-16 17:12:00 +0000
@@ -132,15 +132,19 @@ connect_mysqld(atrt_process* proc)
 
   const char * port = find(proc, "--port=");
   const char * socket = find(proc, "--socket=");
-  assert(port);
+  if (port == 0 && socket == 0)
+  {
+    g_logger.error("Neither socket nor port specified...cant connect to mysql");
+    return false;
+  }
   
   for (size_t i = 0; i<20; i++)
   {
     if (mysql_real_connect(&proc->m_mysql,
 			   proc->m_host->m_hostname.c_str(),
 			   "root", "", "test",
-			   atoi(port),
-			   socket,
+			   port ? atoi(port) : 0,
+			   port ? 0 : socket,
 			   0))
     {
       return true;
@@ -152,8 +156,8 @@ connect_mysqld(atrt_process* proc)
   
   g_logger.error("Failed to connect to mysqld err: >%s< >%s:%u:%s<",
 		 mysql_error(&proc->m_mysql),
-		 proc->m_host->m_hostname.c_str(),atoi(port),
-		 socket);
+		 proc->m_host->m_hostname.c_str(), port ? atoi(port) : 0,
+		 socket ? socket : "<null>");
   return false;
 }
 
@@ -246,7 +250,7 @@ populate_options(MYSQL* mysql, MYSQL_STM
     
     if (mysql_stmt_execute(stmt))
     {
-      g_logger.error("Failed to execute: %s", mysql_error(mysql));
+      g_logger.error("0 Failed to execute: %s", mysql_error(mysql));
       return false;
     }
     kk++;
@@ -286,7 +290,7 @@ populate_db(atrt_config& config, atrt_pr
       
       if (mysql_stmt_execute(stmt))
       {
-	g_logger.error("Failed to execute: %s", mysql_error(&mysqld->m_mysql));
+	g_logger.error("1 Failed to execute: %s", mysql_error(&mysqld->m_mysql));
 	return false;
       }
       mysql_stmt_close(stmt);
@@ -319,7 +323,7 @@ populate_db(atrt_config& config, atrt_pr
       
       if (mysql_stmt_execute(stmt))
       {
-	g_logger.error("Failed to execute: %s", mysql_error(&mysqld->m_mysql));
+	g_logger.error("2 Failed to execute: %s", mysql_error(&mysqld->m_mysql));
 	return false;
       }
     }
@@ -386,7 +390,7 @@ populate_db(atrt_config& config, atrt_pr
       
       if (mysql_stmt_execute(stmt))
       {
-	g_logger.error("Failed to execute: %s", mysql_error(&mysqld->m_mysql));
+	g_logger.error("3 Failed to execute: %s", mysql_error(&mysqld->m_mysql));
 	return false;
       }