bzr commit into mysql-trunk-cluster branch (magnus.blaudd:3323)

[magnus.blaudd]

#At file:///data0/magnus/mysql/trunk-cluster/ based on revid:magnus.blaudd@stripped

 3323 magnus.blaudd@stripped	2011-06-09 [merge]
      Merge 5.5-cluster -> trunk-cluster

    modified:
      client/mysqltest.cc
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2011-06-08 13:34:57 +0000
+++ b/client/mysqltest.cc	2011-06-09 09:09:10 +0000
@@ -4201,10 +4201,11 @@ int do_save_master_pos()
     done on the local mysql server
   */
   {
-    ulong have_ndbcluster;
-    if (mysql_query(mysql, query= "select support "
-                                  "from information_schema.engines "
-                                  "where engine='ndbcluster'"))
+    bool have_ndbcluster;
+    if (mysql_query(mysql, query=
+                    "select count(*) from information_schema.engines"
+                    "  where engine = 'ndbcluster' and"
+                    "        support in ('YES', 'DEFAULT')"))
       die("'%s' failed: %d %s", query,
           mysql_errno(mysql), mysql_error(mysql));
     if (!(res= mysql_store_result(mysql)))
@@ -4212,7 +4213,7 @@ int do_save_master_pos()
     if (!(row= mysql_fetch_row(res)))
       die("Query '%s' returned empty result", query);
 
-    have_ndbcluster= strcmp("YES", row[0]) == 0;
+    have_ndbcluster= strcmp(row[0], "1") == 0;
     mysql_free_result(res);
 
     if (have_ndbcluster)

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).