maria-developers team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Arjen Lentz (arjen-lentz)
  Kristian Nielsen (knielsen)
------------------------------------------------------------
revno: 2761 [merge]
committer: knielsen@xxxxxxxxxxxxxxx
branch nick: tmp
timestamp: Fri 2009-11-06 18:24:38 +0100
message:
  Merge 5.1-release branch into MariaDB trunk.
modified:
  extra/libevent/event-internal.h
  mysql-test/lib/mtr_cases.pm
  mysql-test/mysql-test-run.pl


--
lp:maria
https://code.launchpad.net/~maria-captains/maria/5.1

Your team Maria developers is subscribed to branch lp:maria.
To unsubscribe from this branch go to https://code.launchpad.net/~maria-captains/maria/5.1/+edit-subscription.

=== modified file 'extra/libevent/event-internal.h'
--- extra/libevent/event-internal.h	2009-03-12 22:27:35 +0000
+++ extra/libevent/event-internal.h	2009-10-31 05:29:16 +0000
@@ -70,6 +70,11 @@
 
 /* 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)

=== modified file 'mysql-test/lib/mtr_cases.pm'
--- mysql-test/lib/mtr_cases.pm	2009-10-14 08:09:56 +0000
+++ mysql-test/lib/mtr_cases.pm	2009-11-06 17:24:38 +0000
@@ -249,6 +249,10 @@
       $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"
 			     ],

=== modified file 'mysql-test/mysql-test-run.pl'
--- mysql-test/mysql-test-run.pl	2009-11-06 17:22:32 +0000
+++ mysql-test/mysql-test-run.pl	2009-11-06 17:24:38 +0000
@@ -1000,6 +1000,12 @@
   {
     $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)