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

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

Browse Source
This commit is contained in:
unknown 2002-06-20 23:29:22 +03:00
commit d471ad0c23
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() static void init_pager()
{ {
#if !defined( __WIN__) && !defined( OS2) #if !defined( __WIN__) && !defined( OS2) && (!defined(HAVE_mit_thread) && defined(THREAD))
if (!opt_nopager) if (!opt_nopager)
{ {
if (!(PAGER= popen(pager, "w"))) if (!(PAGER= popen(pager, "w")))
@ -1507,7 +1507,7 @@ static void init_pager()
static void end_pager() static void end_pager()
{ {
#if !defined( __WIN__) && !defined( OS2) #if !defined( __WIN__) && !defined( OS2) && (!defined(HAVE_mit_thread) && defined(THREAD))
if (!opt_nopager) if (!opt_nopager)
pclose(PAGER); pclose(PAGER);
#endif #endif
@ -2498,9 +2498,11 @@ void tee_putc(int c, FILE *file)
#include <time.h> #include <time.h>
#else #else
#include <sys/times.h> #include <sys/times.h>
#ifdef _SC_CLK_TCK // For mit-pthreads
#undef CLOCKS_PER_SEC #undef CLOCKS_PER_SEC
#define CLOCKS_PER_SEC (sysconf(_SC_CLK_TCK)) #define CLOCKS_PER_SEC (sysconf(_SC_CLK_TCK))
#endif #endif
#endif
static ulong start_timer(void) static ulong start_timer(void)
{ {

2
libmysqld/examples/Makefile.am
View File

@ -8,7 +8,7 @@ link_sources:
done; done;
DEFS = -DEMBEDDED_LIBRARY 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 -I$(srcdir) -I$(top_srcdir) -I$(top_srcdir)/client
LIBS = @LIBS@ LIBS = @LIBS@
LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS) 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 #endif
/* Non-standard Linux string routines. */ /* Non-standard Linux string routines. */
#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
__BEGIN_DECLS __BEGIN_DECLS
int bcmp __P_((const void *, const void *, size_t)); int bcmp __P_((const void *, const void *, size_t));
void bcopy __P_((const void *, 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 *strdup __P_((const char *));
char *strsep __P_((char **, const char *)); char *strsep __P_((char **, const char *));
__END_DECLS __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_init(&my_fast_mutexattr);
pthread_mutexattr_setkind_np(&my_fast_mutexattr,PTHREAD_MUTEX_ADAPTIVE_NP); pthread_mutexattr_setkind_np(&my_fast_mutexattr,PTHREAD_MUTEX_ADAPTIVE_NP);
#endif #endif
#ifdef PPTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP #ifdef PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
pthread_mutexattr_init(&my_errchk_mutexattr); pthread_mutexattr_init(&my_errchk_mutexattr);
pthread_mutexattr_setkind_np(&my_errchk_mutexattr, pthread_mutexattr_setkind_np(&my_errchk_mutexattr,
PTHREAD_MUTEX_ERRORCHECK_NP); PTHREAD_MUTEX_ERRORCHECK_NP);