Commit 8672a81b authored by unknown's avatar unknown
Browse files

No need to spcify start_lineno in die message, that is automatic

parent 828f30bf

client/mysqltest.c

+16 −16
Original line number Diff line number Diff line
@@ -2072,8 +2072,8 @@ int do_save_master_pos() 
	      latest_epoch= strtoull(status, (char**) 0, 10);

	    }

	    else

	      die("line %u: result does not contain '%s' in '%s'",

		  start_lineno, latest_epoch_str, query);

	      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))
@@ -2084,8 +2084,8 @@ int do_save_master_pos() 
	      latest_trans_epoch= strtoull(status, (char**) 0, 10);

	    }

	    else

	      die("line %u: result does not contain '%s' in '%s'",

		  start_lineno, latest_trans_epoch_str, query);

	      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,
@@ -2097,8 +2097,8 @@ int do_save_master_pos() 
	      latest_received_binlog_epoch= strtoull(status, (char**) 0, 10);

	    }

	    else

	      die("line %u: result does not contain '%s' in '%s'",

		  start_lineno, latest_received_binlog_epoch_str, query);

	      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,
@@ -2110,8 +2110,8 @@ int do_save_master_pos() 
	      latest_handled_binlog_epoch= strtoull(status, (char**) 0, 10);

	    }

	    else

	      die("line %u: result does not contain '%s' in '%s'",

		  start_lineno, latest_handled_binlog_epoch_str, query);

	      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,
@@ -2123,16 +2123,16 @@ int do_save_master_pos() 
	      latest_applied_binlog_epoch= strtoull(status, (char**) 0, 10);

	    }

	    else

	      die("line %u: result does not contain '%s' in '%s'",

		  start_lineno, latest_applied_binlog_epoch_str, query);

	      die("result does not contain '%s' in '%s'",

		  latest_applied_binlog_epoch_str, query);

	    if (count == 0)

	      start_epoch= latest_trans_epoch;

	    break;

	  }

	}

	if (!row)

	  die("line %u: result does not contain '%s' in '%s'",

	      start_lineno, binlog, query);

	  die("result does not contain '%s' in '%s'",

	      binlog, query);

	if (latest_applied_binlog_epoch > applied_epoch)

	  count= 0;

	applied_epoch= latest_applied_binlog_epoch;