bzr commit into mysql-5.5-cluster branch (magnus.blaudd:3351) WL#5185

[magnus.blaudd]

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

 3351 magnus.blaudd@stripped	2011-06-09
      WL#5185 Remove deprecated 5.1 features
        - follow up patch to WL#5185 which makes mysqltest.cc select
          from information_schema.engines instead of looking at the
          removed have_ndbcluster variable.

    modified:
      client/mysqltest.cc
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2011-05-12 08:43:50 +0000
+++ b/client/mysqltest.cc	2011-06-09 07:40:17 +0000
@@ -4230,8 +4230,11 @@ int do_save_master_pos()
     done on the local mysql server
   */
   {
-    ulong have_ndbcluster;
-    if (mysql_query(mysql, query= "show variables like 'have_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)))
@@ -4239,7 +4242,7 @@ int do_save_master_pos()
     if (!(row= mysql_fetch_row(res)))
       die("Query '%s' returned empty result", query);
 
-    have_ndbcluster= strcmp("YES", row[1]) == 0;
+    have_ndbcluster= strcmp(row[0], "1") == 0;
     mysql_free_result(res);
 
     if (have_ndbcluster)


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