From: magnus.blaudd
Date: June 9 2011 8:14am
Subject: bzr commit into mysql-5.5-cluster branch (magnus.blaudd:3352)
List-Archive: http://lists.mysql.com/commits/138910
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0068694639519202649=="

--===============0068694639519202649==
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

 3352 magnus.blaudd@stripped	2011-06-09
      ndb
       - remove parsing of unused values in the SHOW ENGINE NDB STATUS
         output for binlog

    modified:
      client/mysqltest.cc
=== modified file 'client/mysqltest.cc'
--- a/client/mysqltest.cc	2011-06-09 07:40:17 +0000
+++ b/client/mysqltest.cc	2011-06-09 08:14:13 +0000
@@ -4248,24 +4248,17 @@ int do_save_master_pos()
     if (have_ndbcluster)
     {
       ulonglong start_epoch= 0, handled_epoch= 0,
-	latest_epoch=0, latest_trans_epoch=0,
-	latest_handled_binlog_epoch= 0, latest_received_binlog_epoch= 0,
-	latest_applied_binlog_epoch= 0;
+	latest_trans_epoch=0,
+	latest_handled_binlog_epoch= 0;
       int count= 0;
       int do_continue= 1;
       while (do_continue)
       {
         const char binlog[]= "binlog";
-	const char latest_epoch_str[]=
-          "latest_epoch=";
         const char latest_trans_epoch_str[]=
           "latest_trans_epoch=";
-	const char latest_received_binlog_epoch_str[]=
-	  "latest_received_binlog_epoch";
         const char latest_handled_binlog_epoch_str[]=
           "latest_handled_binlog_epoch=";
-        const char latest_applied_binlog_epoch_str[]=
-          "latest_applied_binlog_epoch=";
         if (count)
           my_sleep(100*1000); /* 100ms */
         if (mysql_query(mysql, query= "show engine ndb status"))
@@ -4279,18 +4272,6 @@ int do_save_master_pos()
           {
             const char *status= row[2];
 
-	    /* latest_epoch */
-	    while (*status && strncmp(status, latest_epoch_str,
-				      sizeof(latest_epoch_str)-1))
-	      status++;
-	    if (*status)
-            {
-	      status+= sizeof(latest_epoch_str)-1;
-	      latest_epoch= strtoull(status, (char**) 0, 10);
-	    }
-	    else
-	      die("result does not contain '%s' in '%s'",
-		  latest_epoch_str, query);
 	    /* latest_trans_epoch */
 	    while (*status && strncmp(status, latest_trans_epoch_str,
 				      sizeof(latest_trans_epoch_str)-1))
@@ -4303,19 +4284,7 @@ int do_save_master_pos()
 	    else
 	      die("result does not contain '%s' in '%s'",
 		  latest_trans_epoch_str, query);
-	    /* latest_received_binlog_epoch */
-	    while (*status &&
-		   strncmp(status, latest_received_binlog_epoch_str,
-			   sizeof(latest_received_binlog_epoch_str)-1))
-	      status++;
-	    if (*status)
-	    {
-	      status+= sizeof(latest_received_binlog_epoch_str)-1;
-	      latest_received_binlog_epoch= strtoull(status, (char**) 0, 10);
-	    }
-	    else
-	      die("result does not contain '%s' in '%s'",
-		  latest_received_binlog_epoch_str, query);
+
 	    /* latest_handled_binlog */
 	    while (*status &&
 		   strncmp(status, latest_handled_binlog_epoch_str,
@@ -4329,19 +4298,7 @@ int do_save_master_pos()
 	    else
 	      die("result does not contain '%s' in '%s'",
 		  latest_handled_binlog_epoch_str, query);
-	    /* latest_applied_binlog_epoch */
-	    while (*status &&
-		   strncmp(status, latest_applied_binlog_epoch_str,
-			   sizeof(latest_applied_binlog_epoch_str)-1))
-	      status++;
-	    if (*status)
-	    {
-	      status+= sizeof(latest_applied_binlog_epoch_str)-1;
-	      latest_applied_binlog_epoch= strtoull(status, (char**) 0, 10);
-	    }
-	    else
-	      die("result does not contain '%s' in '%s'",
-		  latest_applied_binlog_epoch_str, query);
+
 	    if (count == 0)
 	      start_epoch= latest_trans_epoch;
 	    break;


--===============0068694639519202649==
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\
#   uxc5miduycdfnrom
# target_branch: file:///data0/magnus/mysql/5.5-cluster/
# testament_sha1: ed5ca0979fd931e5f804d9714a3c270ce864e530
# timestamp: 2011-06-09 10:14:54 +0200
# source_branch: file:///data0/magnus/mysql/7.0/
# base_revision_id: magnus.blaudd@stripped\
#   08qhf3wk0sdu5c0z
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQ83Ez4AAaNfgAAwUGf//3bh
joC////wUAOteOuxcdI12tCURGpPTamho9KeFMTT1NBhMhppoZAEkkmJ5BknqelNJtT00mjQGjAA
TTIJQhqaCnqYmTah6JoGmmgDQAAOaYmABMAEwAAmAAJgko0RqPQTammiZoUYI0AAeoDIUc95NTQ4
Zw9tq4od2uUoxLKnTfJGom7BFFVHce5sS45WQ7JqqgeejYHxKeixrHWMrVHXQpBmgpgmPDt1bNXu
1vv+8OVFdUjZO9gU55J2Vvnz1WIxUJqo2RhcHCGKXLea4sOluaVktiRJa0i6cmtlIqRzclSj4wzH
lKhrnkBhD+IYkG0xPBhEDRyDQ4WJuCAjUxYoyV3WdKyceIYBWKcX6uDB7ISEfk49lQibQqhy1XQM
BXaDPJcAuQ879N4bCwbh5JqFsYTYxkrafAmwjJ0fYustUXGA4HeRube4rtCy3I2QGweJ9b3jx46b
MzXq5eQCLlt7ME0CGLGImNYlX8RgW4yZCccg/h4rq5RdxMXGeFeRYG2emDewMPFGheaJUwEVEaio
x11kYwQw0yVY/M0VxoJttuDMjWcFhTHFW/HVKz3KPNRgBGWy4vni+NZcxALHs4RkaTGGdIuLyaZL
8E8uF0W3DNZKgtbDjIrrEoB6FjrOfTip07kFI7/q1EOfF11UU18htDN3y3k7l9xDub/ubfvoguBB
sGpawMkZUZDNZ4btqIXejTbNGHqiGvVPPHOsrxOg7xVRDwovGonbCHV+bkQp0CEjTTsDZk2iRF7Y
XPYTz6+riZrFVEfMkkU7SRux69E0yd1DLUkVw323pGFGr2i5H+0TmDGwTPmtUEwXjRZKw35SmeK2
RxoZLcCBM/HO5tddcy6O2nDf7FsawdUpUipaOg9cPDJluvcguMlBqNtzLAwnAz3hDfTZUVlx47++
sXU9dhezsS8AtDaHVjLzosQxhkWd0k7aLdXgb8kxrGCy/0njlSMQ5BwuvIX88ugOpsxDpHaGekNL
B4mKRGaQ4nMbhTPgZqyL5kRMoep7CsVo8iG0dAl0cTuXFUxwzvAHaMCpx5hQkJnLwSKMu0q7i+yg
8KCHDisO9ivySPoDk9ylCZtTpsyao0ZFsqWv9+b8hbeoZ3JyS3PqtkhXmgR41pKUnnElXVQ4LgRB
6Jx1hKy9SvduBqVv3cbblzmCV9yIZVSJKpnfwcNg7eqyg5na9VxYD1po+LlZRGhInqONs5Ao5XZm
Qpi1miMkwcz1gyzmZHM4VinuYqE8mb1zn1PmZ7ONYs2H2LYn/F3JFOFCQDzcTPg=


--===============0068694639519202649==--