From 23b6b4a56564924cd1740b4a13450f0515acca74 Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.blaudden" <>
Date: Mon, 26 Feb 2007 14:52:51 +0100
Subject: [PATCH 1/2] Only allow a version number to be read from
 "/etc/debian_version"

---
 mysql-test/mysql-test-run.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index fc0ad54c095..ed26204d7cb 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1626,7 +1626,7 @@ sub environment_setup () {
   my $deb_version;
   if (  $opt_valgrind and -d $debug_libraries_path and
         (! -e '/etc/debian_version' or
-         ($deb_version= mtr_grab_file('/etc/debian_version')) == 0 or
+	 ($deb_version= mtr_grab_file('/etc/debian_version')) !~ /^[0-9]+\.[0-9]$/ or
          $deb_version > 3.1 ) )
   {
     push(@ld_library_paths, $debug_libraries_path);

From ed61e4868d714dbf1300e1e3bae593232321859d Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.blaudden" <>
Date: Wed, 28 Feb 2007 10:05:51 +0100
Subject: [PATCH 2/2] Use cygwin for --exec and --system in mysqltest for MySQL
 before 5.0

---
 client/mysqltest.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/client/mysqltest.c b/client/mysqltest.c
index 055577fc535..0300afd980c 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -61,6 +61,11 @@
 # endif
 #endif
 
+/* Use cygwin for --exec and --system before 5.0 */
+#if MYSQL_VERSION_ID < 50000
+#define USE_CYGWIN
+#endif
+
 #define MAX_VAR_NAME_LENGTH    256
 #define MAX_COLUMNS            256
 #define MAX_EMBEDDED_SERVER_ARGS 64