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

Fixes for compiling distribution with MIT-threads

Browse source 
client/mysql.cc:
  Fixes for MIT-pthreads
libmysqld/examples/Makefile.am:
  Fixes for MIT-pthreads
mit-pthreads/machdep/linux-2.0/__string.h:
  Fixes for MIT-pthreads
mysys/my_thr_init.c:
  Fixed spelling error.
This commit is contained in:
unknown 2002-06-20 23:26:39 +03:00
parent 8d1568b882
commit 2e20fc9a2c
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
client/mysql.cc
View file

@ -1491,7 +1491,7 @@ com_go(String *buffer,char *line __attribute__((unused)))
static void init_pager()
{
#if !defined( __WIN__) && !defined( OS2)
#if !defined( __WIN__) && !defined( OS2) && (!defined(HAVE_mit_thread) && defined(THREAD))
if (!opt_nopager)
{
if (!(PAGER= popen(pager, "w")))
@ -1507,7 +1507,7 @@ static void init_pager()
static void end_pager()
{
#if !defined( __WIN__) && !defined( OS2)
#if !defined( __WIN__) && !defined( OS2) && (!defined(HAVE_mit_thread) && defined(THREAD))
if (!opt_nopager)
pclose(PAGER);
#endif
@ -2498,9 +2498,11 @@ void tee_putc(int c, FILE *file)
#include <time.h>
#else
#include <sys/times.h>
#ifdef _SC_CLK_TCK // For mit-pthreads
#undef CLOCKS_PER_SEC
#define CLOCKS_PER_SEC (sysconf(_SC_CLK_TCK))
#endif
#endif
static ulong start_timer(void)
{

2
libmysqld/examples/Makefile.am
View file

@ -8,7 +8,7 @@ link_sources:
done;
DEFS = -DEMBEDDED_LIBRARY
INCLUDES = -I$(top_srcdir)/include $(openssl_includes) \
INCLUDES = @MT_INCLUDES@ -I$(top_srcdir)/include $(openssl_includes) \
-I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/client
LIBS = @LIBS@
LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS)

2
mit-pthreads/machdep/linux-2.0/__string.h
View file

@ -5,7 +5,6 @@ typedef pthread_size_t size_t;
#endif
/* Non-standard Linux string routines. */
#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
__BEGIN_DECLS
int bcmp __P_((const void *, const void *, size_t));
void bcopy __P_((const void *, void *, size_t));
@ -15,4 +14,3 @@ char *rindex __P_((const char *, int));
char *strdup __P_((const char *));
char *strsep __P_((char **, const char *));
__END_DECLS
#endif

2
mysys/my_thr_init.c
View file

@ -55,7 +55,7 @@ my_bool my_thread_global_init(void)
pthread_mutexattr_init(&my_fast_mutexattr);
pthread_mutexattr_setkind_np(&my_fast_mutexattr,PTHREAD_MUTEX_ADAPTIVE_NP);
#endif
#ifdef PPTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
#ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
pthread_mutexattr_init(&my_errchk_mutexattr);
pthread_mutexattr_setkind_np(&my_errchk_mutexattr,
PTHREAD_MUTEX_ERRORCHECK_NP);