From 0673379006a7352d611ae6c92b0c8799600328a1 Mon Sep 17 00:00:00 2001
From: Arjen Lentz <arjen@openquery.com>
Date: Sat, 31 Oct 2009 15:29:16 +1000
Subject: [PATCH 1/2] libevent fixup required for Debian 4 (Etch) Also missing
 copyright for copied macros. Fix by Antony Curtis.

---
 extra/libevent/event-internal.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/extra/libevent/event-internal.h b/extra/libevent/event-internal.h
index 19b7a547a84..9dd0c4d7632 100644
--- a/extra/libevent/event-internal.h
+++ b/extra/libevent/event-internal.h
@@ -70,6 +70,11 @@ struct event_base {
 
 /* Internal use only: Functions that might be missing from <sys/queue.h> */
 #ifndef HAVE_TAILQFOREACH
+/* These following macros are copied from BSD sys/queue.h
+   Copyright (c) 1991, 1993, The Regents of the University of California.
+   All rights reserved.
+*/
+#define	TAILQ_EMPTY(head)		((head)->tqh_first == NULL)
 #define	TAILQ_FIRST(head)		((head)->tqh_first)
 #define	TAILQ_END(head)			NULL
 #define	TAILQ_NEXT(elm, field)		((elm)->field.tqe_next)

From 3dcbe769fbc54b90e41888c79e6e43125a8f04d3 Mon Sep 17 00:00:00 2001
From: unknown <knielsen@knielsen-hq.org>
Date: Thu, 5 Nov 2009 14:40:01 +0100
Subject: [PATCH 2/2] Fix running test suite from installed package. Some files
 are in different locations in this case.

---
 mysql-test/lib/mtr_cases.pm  | 4 ++++
 mysql-test/mysql-test-run.pl | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
index 046887c4428..6cdae0d74d8 100644
--- a/mysql-test/lib/mtr_cases.pm
+++ b/mysql-test/lib/mtr_cases.pm
@@ -249,6 +249,10 @@ sub collect_one_suite($)
       $suitedir= my_find_dir($::basedir,
 			     ["mysql-test/suite",
 			      "mysql-test",
+			      "share/mysql-test/suite",
+			      "share/mysql-test",
+			      "share/mysql/mysql-test/suite",
+			      "share/mysql/mysql-test",
 			      # Look in storage engine specific suite dirs
 			      "storage/*/mysql-test-suites"
 			     ],
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 72e49ed01f8..0b849a4ff5a 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1001,6 +1001,12 @@ sub command_line_setup {
   {
     $basedir= dirname($basedir);
   }
+  # For .deb, it's like RPM, but installed in /usr/share/mysql/mysql-test.
+  # So move up one more directory level yet.
+  if ( ! $source_dist and ! -d "$basedir/bin" )
+  {
+    $basedir= dirname($basedir);
+  }
 
   # Look for the client binaries directory
   if ($path_client_bindir)