bzr commit into mysql-trunk branch (magnus.blaudd:3167) WL#5185

[magnus.blaudd]

#At file:///data0/magnus/mysql/trunk/ based on revid:olav.sandstaa@stripped

 3167 magnus.blaudd@stripped	2011-06-08
      WL#5185 Remove deprecated 5.1 features
      - follow up patch to WL#5185 which makes mysqltest.cc select
         form 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-06-06 10:29:45 +0000
+++ b/client/mysqltest.cc	2011-06-08 13:32:23 +0000
@@ -4202,7 +4202,9 @@ int do_save_master_pos()
   */
   {
     ulong have_ndbcluster;
-    if (mysql_query(mysql, query= "show variables like 'have_ndbcluster'"))
+    if (mysql_query(mysql, query= "select support "
+                                  "from information_schema.engines "
+                                  "where engine='ndbcluster'"))
       die("'%s' failed: %d %s", query,
           mysql_errno(mysql), mysql_error(mysql));
     if (!(res= mysql_store_result(mysql)))
@@ -4210,7 +4212,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("YES", row[0]) == 0;
     mysql_free_result(res);
 
     if (have_ndbcluster)


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