Below is the list of changes that have just been committed into a
4.0 repository of monty. When monty does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html
ChangeSet
1.1038 02/06/20 23:26:39 monty@stripped +4 -0
Fixes for compiling distribution with MIT-threads
mysys/my_thr_init.c
1.20 02/06/20 23:26:37 monty@stripped +1 -1
Fixed spelling error.
mit-pthreads/machdep/linux-2.0/__string.h
1.3 02/06/20 23:26:37 monty@stripped +0 -2
Fixes for MIT-pthreads
libmysqld/examples/Makefile.am
1.9 02/06/20 23:26:36 monty@stripped +1 -1
Fixes for MIT-pthreads
client/mysql.cc
1.111 02/06/20 23:26:36 monty@stripped +4 -2
Fixes for MIT-pthreads
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: monty
# Host: hundin.mysql.fi
# Root: /my/bk/mysql-4.0
--- 1.110/client/mysql.cc Wed Jun 12 17:35:02 2002
+++ 1.111/client/mysql.cc Thu Jun 20 23:26:36 2002
@@ -1491,7 +1491,7 @@
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 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,8 +2498,10 @@
#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)
--- 1.2/mit-pthreads/machdep/linux-2.0/__string.h Wed Aug 30 22:41:51 2000
+++ 1.3/mit-pthreads/machdep/linux-2.0/__string.h Thu Jun 20 23:26:37 2002
@@ -5,7 +5,6 @@
#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 *strdup __P_((const char *));
char *strsep __P_((char **, const char *));
__END_DECLS
-#endif
--- 1.19/mysys/my_thr_init.c Sun Jun 16 17:06:03 2002
+++ 1.20/mysys/my_thr_init.c Thu Jun 20 23:26:37 2002
@@ -55,7 +55,7 @@
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);
--- 1.8/libmysqld/examples/Makefile.am Sun Mar 31 01:24:29 2002
+++ 1.9/libmysqld/examples/Makefile.am Thu Jun 20 23:26:36 2002
@@ -8,7 +8,7 @@
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)
| Thread |
|---|
| • bk commit into 4.0 tree | monty | 20 Jun |
