bzr commit into mysql-5.1-telco-6.3 branch (jonas:3161)

[Jonas Oreland]

#At file:///home/jonas/src/telco-6.3/ based on revid:jonas@stripped

 3161 Jonas Oreland	2010-03-22
      ndb - don't require mysql-clients to have node-id

    modified:
      storage/ndb/test/ndbapi/testUpgrade.cpp
=== modified file 'storage/ndb/test/ndbapi/testUpgrade.cpp'
--- a/storage/ndb/test/ndbapi/testUpgrade.cpp	2010-02-18 23:01:15 +0000
+++ b/storage/ndb/test/ndbapi/testUpgrade.cpp	2010-03-22 08:48:37 +0000
@@ -577,7 +577,7 @@ int runCheckStarted(NDBT_Context* ctx, N
 
   // Make sure atrt assigns nodeid != -1
   SqlResultSet procs;
-  if (!atrt.doQuery("SELECT * FROM process", procs))
+  if (!atrt.doQuery("SELECT * FROM process where type <> \'mysql\'", procs))
     return NDBT_FAILED;
 
   while (procs.next())


Attachment: [text/bzr-bundle] bzr/[e-mail]