#At file:///Users/pcrews/usr/local/bin/data1/work/win_diff/mysql-5.0-bugteam/ based on revid:patrick.crews@stripped
2747 Patrick Crews 2008-12-19
Bug#38833: mysql-test-run needs diff. Problem w/ error handling in calling diff on Windows.
Removed unused variable and added a comment to explain how we are testing for diff.
modified:
client/mysqltest.c
=== modified file 'client/mysqltest.c'
--- a/client/mysqltest.c 2008-12-18 22:18:42 +0000
+++ b/client/mysqltest.c 2008-12-19 14:16:48 +0000
@@ -1344,12 +1344,13 @@ int diff_check()
char buf[512]= {0};
FILE *res_file;
char *cmd = "diff -v";
- char *err_string= "\"diff\"";
int have_diff = 0;
if (!(res_file= popen(cmd, "r")))
die("popen(\"%s\", \"r\") failed", cmd);
+/* if diff is not present, this loop does not
+process */
while (fgets(buf, sizeof(buf), res_file))
{
have_diff += 1;
| Thread |
|---|
| • bzr commit into mysql-5.0-bugteam branch (patrick.crews:2747) Bug#38833 | Patrick Crews | 19 Dec |