Commit 12f9623b authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

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

parents f3cc808a b341b594

client/mysql.cc

+4 −2
Original line number Diff line number Diff line
@@ -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)

{

libmysqld/examples/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -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)

mit-pthreads/machdep/linux-2.0/__string.h

+0 −2
Original line number Diff line number Diff line
@@ -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

mysys/my_thr_init.c

+1 −1
Original line number Diff line number Diff line
@@ -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);