From: magnus.blaudd
Date: June 9 2011 7:44am
Subject: bzr commit into mysql-5.5-cluster branch (magnus.blaudd:3351) WL#5185
List-Archive: http://lists.mysql.com/commits/138905
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6240523728828610797=="

--===============6240523728828610797==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#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)


--===============6240523728828610797==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/magnus.blaudd@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: magnus.blaudd@stripped\
#   08qhf3wk0sdu5c0z
# target_branch: file:///data0/magnus/mysql/5.5-cluster/
# testament_sha1: e393514b6cae05622f380cfa4cf99b6061b833ff
# timestamp: 2011-06-09 09:44:32 +0200
# source_branch: file:///data0/magnus/mysql/7.0/
# base_revision_id: magnus.blaudd@stripped\
#   1z842kme2agq5zt0
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWfvmYLEAAcj/gEQQQABY9///
dwQeqr////BQBC0Vt7G4ZwF2MJKJknoKeSYno0MKRhk0npPQg09QzKPU0ElJPTQaaNGglPyp6j1N
qAHqAANADagxU02iT0nqmnqZqGjamgGQaAAAADmmJkyaMJgmJpgEwCGCMCMAkkTSY01NBoaBoo8T
KeoAD1BoAaHCxWTaG/nz9yOzPxrk+vOfDi8hRpxoNFt5Fde6J1QkmovoBXCftO2Dd00kWh5HE+qy
gTWBvDV04xhbibHl8ZsKl1fr3lo9YN9i3P6tzv/jeNrSzS0mk/0Ls00+sqp5sefs4R1T4k9ilYfc
p378Hgw6GUMzT+Obd0tk9orZOsWpZi8RTps0a3QLC/o6oQjbekQB6ReUzSOug9K9rdZOONkTSIaI
bh1AXOD0QIBhnB0F5bMDQTExN73qldYHJs4OuDEW2W4gH0fARYT7YxE0Tsjq9GZ0zl6HXCuRKsrx
ymrRYKx11kcJjVWZzDmCJVwb0HXMC6i3mb5KeVgUJkzUZzsCpfshwpQTLCanW2PwRG4CwkAwMi+G
MiSqaBNebOGpx+ycnykSZ+krsrNL9uMoLZdh18JE5UPIuBktCgf2ChGc7E6vS5Be03l7Q7brcDLS
EpTIYW0yZTRSb2xsLXIInF9UUqKNtmjyN96rNhp0LtalanqZo8xhY2Hd1vuzHie1TCtqU+WmcqGm
JutK1v4XyiHUPdVWmRCv0CmgplSIANBU5e0Xr/TTwWV5rXIwVb4kjg+diYcNsXDk7kcp4vT+3ul8
MuLJQBb5ebx5q7hjg+Ozs069njekU7GS6jC8KEjtTJOfnfVr2UI75HsipaqakjCu/uTiMxFdQx+w
7Q3JGHhfqRMPLRW8xbLlwR4dpIPbus02NuMTWJHllBl0yRktoP2MUJseHpy0xR4KYJyZMskiYNpJ
EKbOJ7KoC/HF/LLqErca+StbkcO/PnxOEz3hBNudyLqCdz9s9YqmUbr2bYTGZgf6rXga7jBMttoz
YWKWq7bbyjJM0cVANcTg9P98NzriQrzF3Xmak/mx+Jltcc3vfaRQ5MJcN4XBbQUupgdeImasIG64
tbDLwTasEs5rzqYxjw5LC8e3fothmCg3hkvxEMXS64TZNOjOG7kGB2vWG2QSeE3RIg0khxMRH121
X6YxBsCIApNUaA+B2GcUyRsWGiFhofUVzzlmwuK8MSoT6B4Z/Sw6DCrVDqnicyvSHLib92WVRM8x
iMLFAu7RqnPBIiFKOY5Rq0FNGN5tVlzMmbimscc8aMV029AqbBdqGlaUEllLdSzxORG7vVjXPVYr
IlaH13PggkERWSIRgKdAMtqdyDZAFUd5ttt4vQVi62IiEv86XiztvdQsocE9/eTPc5zGRlwCsbzu
hdVIeTYAqTNBlKGZJkjoWmzNXGJZFIsRxM5PgrTTqYHZRoHtE/kxXcZDrSreTLm0i0eL2HlOpHA0
9SytnZDNcyqJ/xdyRThQkPvmYLE=


--===============6240523728828610797==--