1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

compilation/test fixes

Browse Source
This commit is contained in:
serg@sergbook.mysql.com 2007-04-29 17:46:18 -07:00
parent 10057bf4c3
commit 1bd2953c02
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/my_global.h
View File

@ -466,7 +466,7 @@ C_MODE_END
#include <assert.h> #include <assert.h>
/* an assert that works at compile-time. only for constant expression */ /* an assert that works at compile-time. only for constant expression */
#ifdef __WIN__ #ifndef __GNUC__
#define compile_time_assert(X) do { } while(0) #define compile_time_assert(X) do { } while(0)
#else #else
#define compile_time_assert(X) \ #define compile_time_assert(X) \

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

@ -1361,7 +1361,10 @@ sub collect_mysqld_features () {
# --no-defaults and --skip-grant-tables are to avoid loading # --no-defaults and --skip-grant-tables are to avoid loading
# system-wide configs and plugins # system-wide configs and plugins
# #
my $list= `$exe_mysqld --no-defaults --datadir=$default_vardir --language=$path_language --skip-grant-tables --verbose --help`; # --datadir - for lowercase test to work
#
my $tmp_datadir=$opt_vardir || $default_vardir;
my $list= `$exe_mysqld --no-defaults --datadir=$tmp_datadir --language=$path_language --skip-grant-tables --verbose --help`;
foreach my $line (split('\n', $list)) foreach my $line (split('\n', $list))
{ {

4
sql/mysql_priv.h
View File

@ -259,9 +259,9 @@ MY_LOCALE *my_locale_by_number(uint number);
#define MAX_CONNECT_ERRORS 10 // errors before disabling host #define MAX_CONNECT_ERRORS 10 // errors before disabling host
#ifdef __NETWARE__ #ifdef __NETWARE__
#define IF_NETWARE(A,B) (A) #define IF_NETWARE(A,B) A
#else #else
#define IF_NETWARE(A,B) (B) #define IF_NETWARE(A,B) B
#endif #endif
#if defined(__WIN__) #if defined(__WIN__)

4
storage/innobase/handler/ha_innodb.cc
View File

@ -7675,9 +7675,7 @@ static MYSQL_SYSVAR_ULONG(fast_shutdown, innobase_fast_shutdown,
NetWare can't close unclosed files, can't automatically kill remaining NetWare can't close unclosed files, can't automatically kill remaining
threads, etc, so on this OS we disable the crash-like InnoDB shutdown. threads, etc, so on this OS we disable the crash-like InnoDB shutdown.
*/ */
#ifndef __NETWARE__ IF_NETWARE("", " or 2 (fastest - crash-like)")
" or 2 (fastest - crash-like)"
#endif
".", ".",
NULL, NULL, 1, 0, IF_NETWARE(1,2), 0); NULL, NULL, 1, 0, IF_NETWARE(1,2), 0);