mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 05:22:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge work:/home/bk/mysql-4.0

Browse source 
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
This commit is contained in:
serg@serg.mysql.com 2003-02-25 20:44:16 +01:00
commit 4fb5c13e93
5 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.bzrignore
View file

@ -525,3 +525,6 @@ vio/viotest-ssl
extra/mysql_waitpid extra/mysql_waitpid
support-files/MacOSX/Description.plist support-files/MacOSX/Description.plist
support-files/MacOSX/Info.plist support-files/MacOSX/Info.plist
support-files/MacOSX/StartupParameters.plist
support-files/MacOSX/postinstall
support-files/MacOSX/preinstall

2
BUILD/compile-pentium-debug-max
View file

@ -3,7 +3,7 @@
path=`dirname $0` path=`dirname $0`
. "$path/SETUP.sh" . "$path/SETUP.sh"
extra_flags="$pentium_cflags $debug_cflags" extra_flags="$pentium_cflags $debug_cflags -DBIG_TABLES"
c_warnings="$c_warnings $debug_extra_warnings" c_warnings="$c_warnings $debug_extra_warnings"
cxx_warnings="$cxx_warnings $debug_extra_warnings" cxx_warnings="$cxx_warnings $debug_extra_warnings"
extra_configs="$pentium_configs $debug_configs" extra_configs="$pentium_configs $debug_configs"

5
include/my_pthread.h
View file

@ -443,6 +443,11 @@ int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
struct timespec *abstime); struct timespec *abstime);
#endif #endif
#if defined(HPUX10)
#define pthread_attr_getstacksize(A,B) my_pthread_attr_getstacksize(A,B)
void my_pthread_attr_getstacksize(pthread_attr_t *attrib, size_t *size);
#endif
#if defined(HAVE_POSIX1003_4a_MUTEX) && !defined(DONT_REMAP_PTHREAD_FUNCTIONS) #if defined(HAVE_POSIX1003_4a_MUTEX) && !defined(DONT_REMAP_PTHREAD_FUNCTIONS)
#undef pthread_mutex_trylock #undef pthread_mutex_trylock
#define pthread_mutex_trylock(a) my_pthread_mutex_trylock((a)) #define pthread_mutex_trylock(a) my_pthread_mutex_trylock((a))

12
mysys/my_pthread.c
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2000 MySQL AB /* Copyright (C) 2000-2003 MySQL AB
This program is free software; you can redistribute it and/or modify This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by it under the terms of the GNU General Public License as published by
@ -393,6 +393,7 @@ int pthread_signal(int sig, void (*func)())
#undef pthread_cond_wait #undef pthread_cond_wait
#undef pthread_cond_timedwait #undef pthread_cond_timedwait
#undef pthread_cond_t #undef pthread_cond_t
#undef pthread_attr_getstacksize
/***************************************************************************** /*****************************************************************************
** Patches for AIX and DEC OSF/1 3.2 ** Patches for AIX and DEC OSF/1 3.2
@ -465,6 +466,15 @@ int my_pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
} }
#endif #endif
#if defined(HPUX10)
void my_pthread_attr_getstacksize(pthread_attr_t *connection_attrib,
size_t *stack_size)
{
*stack_size= pthread_attr_getstacksize(*connection_attrib);
}
#endif
#ifdef HAVE_POSIX1003_4a_MUTEX #ifdef HAVE_POSIX1003_4a_MUTEX
/* /*

12
sql/mysqld.cc
View file

@ -264,6 +264,9 @@ bool opt_large_files= sizeof(my_off_t) > 4;
#define GET_HA_ROWS GET_ULONG #define GET_HA_ROWS GET_ULONG
#endif #endif
#ifdef HAVE_LIBWRAP
char *libwrapName= NULL;
#endif
/* /*
Variables to store startup options Variables to store startup options
@ -1855,14 +1858,13 @@ struct utsname
char nodename[FN_REFLEN]; char nodename[FN_REFLEN];
}; };
int uname(struct utsname *a) int uname(struct utsname *a)
{ {
return -1; return -1;
} }
#endif
#ifdef __WIN__
extern "C" pthread_handler_decl(handle_shutdown,arg) extern "C" pthread_handler_decl(handle_shutdown,arg)
{ {
MSG msg; MSG msg;
@ -1878,7 +1880,7 @@ extern "C" pthread_handler_decl(handle_shutdown,arg)
return 0; return 0;
} }
int __stdcall handle_kill(ulong ctrl_type) int STDCALL handle_kill(ulong ctrl_type)
{ {
if (ctrl_type == CTRL_CLOSE_EVENT || if (ctrl_type == CTRL_CLOSE_EVENT ||
ctrl_type == CTRL_SHUTDOWN_EVENT) ctrl_type == CTRL_SHUTDOWN_EVENT)
@ -1919,10 +1921,6 @@ extern "C" pthread_handler_decl(handle_shutdown,arg)
const char *load_default_groups[]= { "mysqld","server",0 }; const char *load_default_groups[]= { "mysqld","server",0 };
#ifdef HAVE_LIBWRAP
char *libwrapName=NULL;
#endif
bool open_log(MYSQL_LOG *log, const char *hostname, bool open_log(MYSQL_LOG *log, const char *hostname,
const char *opt_name, const char *extension, const char *opt_name, const char *extension,
const char *index_file_name, const char *index_file_name,