From a6a8ea0bc95c7d6a116f7e56b53a132f0dd818c8 Mon Sep 17 00:00:00 2001
From: "msvensson@shellback.(none)" <>
Date: Wed, 16 Aug 2006 20:38:33 +0200
Subject: [PATCH 1/3] Remove duplicate free of "ds_res"

---
 client/mysqltest.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/client/mysqltest.c b/client/mysqltest.c
index 549c6e85837..0f0abe682b5 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -4957,9 +4957,6 @@ int main(int argc, char **argv)
     die("No queries executed but result file found!");
   }
 
-
-  dynstr_free(&ds_res);
-
   if (!got_end_timer)
     timer_output();				/* No end_timer cmd, end it */
   free_used_memory();

From 2b2985e0eaf83be1a728abfb22c510e1badb2620 Mon Sep 17 00:00:00 2001
From: "msvensson@shellback.(none)" <>
Date: Mon, 21 Aug 2006 14:06:59 +0200
Subject: [PATCH 2/3] Print lines from log file to see what's in them

---
 tests/mysql_client_test.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index c64ebc9e281..8d85358d740 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -14963,6 +14963,8 @@ static void test_bug17667()
             DIE("Read error");
           }
         }
+        /* Print the line */
+        printf("%s", line_buffer);
 
       } while (my_memmem(line_buffer, MAX_TEST_QUERY_LENGTH*2,
             statement_cursor->buffer, statement_cursor->length) == NULL);

From 39a8fe6e4490f77a731c33f80cfd2e307d9bb028 Mon Sep 17 00:00:00 2001
From: "iggy@rolltop.ignatz42.dyndns.org" <>
Date: Mon, 21 Aug 2006 20:29:11 -0400
Subject: [PATCH 3/3] Bug#21757: mysql_client_test fails in testcase when
 reading master.log file

---
 tests/mysql_client_test.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/mysql_client_test.c b/tests/mysql_client_test.c
index 88c1a5737d3..427994f832f 100644
--- a/tests/mysql_client_test.c
+++ b/tests/mysql_client_test.c
@@ -14950,7 +14950,7 @@ static void test_bug17667()
   strcpy(master_log_filename, opt_vardir);
   strcat(master_log_filename, "/log/master.log");
   printf("Opening '%s'\n", master_log_filename);
-  log_file= fopen(master_log_filename, "r");
+  log_file= my_fopen(master_log_filename, (int) (O_RDONLY | O_BINARY), MYF(MY_WME));
   free(master_log_filename);
 
   if (log_file != NULL) {
@@ -14997,7 +14997,7 @@ static void test_bug17667()
   }
 
   if (log_file != NULL)
-    fclose(log_file);
+    my_fclose(log_file, MYF(0));
 
 }