1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
msvensson@shellback.(none) 2006-09-29 11:39:54 +02:00
parent d6ad8e3ea1
commit 010fb6bfcd
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
client/mysqltest.c
View File

@ -2072,8 +2072,8 @@ int do_save_master_pos()
latest_epoch= strtoull(status, (char**) 0, 10); latest_epoch= strtoull(status, (char**) 0, 10);
} }
else else
die("line %u: result does not contain '%s' in '%s'", die("result does not contain '%s' in '%s'",
start_lineno, latest_epoch_str, query); latest_epoch_str, query);
/* latest_trans_epoch */ /* latest_trans_epoch */
while (*status && strncmp(status, latest_trans_epoch_str, while (*status && strncmp(status, latest_trans_epoch_str,
sizeof(latest_trans_epoch_str)-1)) sizeof(latest_trans_epoch_str)-1))
@ -2084,8 +2084,8 @@ int do_save_master_pos()
latest_trans_epoch= strtoull(status, (char**) 0, 10); latest_trans_epoch= strtoull(status, (char**) 0, 10);
} }
else else
die("line %u: result does not contain '%s' in '%s'", die("result does not contain '%s' in '%s'",
start_lineno, latest_trans_epoch_str, query); latest_trans_epoch_str, query);
/* latest_received_binlog_epoch */ /* latest_received_binlog_epoch */
while (*status && while (*status &&
strncmp(status, latest_received_binlog_epoch_str, 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); latest_received_binlog_epoch= strtoull(status, (char**) 0, 10);
} }
else else
die("line %u: result does not contain '%s' in '%s'", die("result does not contain '%s' in '%s'",
start_lineno, latest_received_binlog_epoch_str, query); latest_received_binlog_epoch_str, query);
/* latest_handled_binlog */ /* latest_handled_binlog */
while (*status && while (*status &&
strncmp(status, latest_handled_binlog_epoch_str, 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); latest_handled_binlog_epoch= strtoull(status, (char**) 0, 10);
} }
else else
die("line %u: result does not contain '%s' in '%s'", die("result does not contain '%s' in '%s'",
start_lineno, latest_handled_binlog_epoch_str, query); latest_handled_binlog_epoch_str, query);
/* latest_applied_binlog_epoch */ /* latest_applied_binlog_epoch */
while (*status && while (*status &&
strncmp(status, latest_applied_binlog_epoch_str, 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); latest_applied_binlog_epoch= strtoull(status, (char**) 0, 10);
} }
else else
die("line %u: result does not contain '%s' in '%s'", die("result does not contain '%s' in '%s'",
start_lineno, latest_applied_binlog_epoch_str, query); latest_applied_binlog_epoch_str, query);
if (count == 0) if (count == 0)
start_epoch= latest_trans_epoch; start_epoch= latest_trans_epoch;
break; break;
} }
} }
if (!row) if (!row)
die("line %u: result does not contain '%s' in '%s'", die("result does not contain '%s' in '%s'",
start_lineno, binlog, query); binlog, query);
if (latest_applied_binlog_epoch > applied_epoch) if (latest_applied_binlog_epoch > applied_epoch)
count= 0; count= 0;
applied_epoch= latest_applied_binlog_epoch; applied_epoch= latest_applied_binlog_epoch;