database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge 5.1-release branch into MariaDB trunk.

Browse Source
This commit is contained in:
unknown
2009-11-06 18:24:38 +01:00
parent ad368a2b54 3dcbe769fb
commit e33e42769a
3 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
extra/libevent/event-internal.h
View File

@ -70,6 +70,11 @@ struct event_base {
/* Internal use only: Functions that might be missing from <sys/queue.h> */ /* Internal use only: Functions that might be missing from <sys/queue.h> */
#ifndef HAVE_TAILQFOREACH #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_FIRST(head) ((head)->tqh_first)
#define TAILQ_END(head) NULL #define TAILQ_END(head) NULL
#define TAILQ_NEXT(elm, field) ((elm)->field.tqe_next) #define TAILQ_NEXT(elm, field) ((elm)->field.tqe_next)

4
mysql-test/lib/mtr_cases.pm
View File

@ -249,6 +249,10 @@ sub collect_one_suite($)
$suitedir= my_find_dir($::basedir, $suitedir= my_find_dir($::basedir,
["mysql-test/suite", ["mysql-test/suite",
"mysql-test", "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 # Look in storage engine specific suite dirs
"storage/*/mysql-test-suites" "storage/*/mysql-test-suites"
], ],

6
mysql-test/mysql-test-run.pl
View File

@ -1000,6 +1000,12 @@ sub command_line_setup {
{ {
$basedir= dirname($basedir); $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 # Look for the client binaries directory
if ($path_client_bindir) if ($path_client_bindir)