bk commit into 5.0 tree (bldsql:1.1905)
0 answers - 2007 bytes -

Below is the list of changes that have just been committed into a local
5.0 repository of bldsql. When bldsql 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
ChangeSet
1.1905 05/08/23 12:04:36 bldsql (AT) blr-naas-nwl03 (DOT) blr.novell.com +2 -0
Merge
into
sql/mysqld.cc
1.480 05/08/23 12:04:13 bldsql (AT) blr-naas-nwl03 (DOT) blr.novell.com +0 -0
Auto merged
include/config-netware.h
1.11 05/08/23 12:04:13 bldsql (AT) blr-naas-nwl03 (DOT) blr.novell.com +0 -0
Auto merged
# 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:bldsql
# Host:blr-naas-nwl03.blr.novell.com
# Root:/
1.479/sql/mysqld.cc2005-08-18 15:40:06 +05:30
1.480/sql/mysqld.cc2005-08-23 12:04:13 +05:30
@@ -730,7 +730,8 @@
DBUG_PRINT("quit",("Informing thread %ld that it's time to die",
tmp->thread_id));
/* We skip slave threads on this first loop through. */
- if (tmp->slave_thread) continue;
+ if (tmp->slave_thread)
+ continue;
tmp->killed= THD::KILL_CNNECTIN;
if (tmp->mysys_var)
1.10/include/config-netware.h2005-08-10 22:24:13 +05:30
1.11/include/config-netware.h2005-08-23 12:04:13 +05:30
@@ -53,6 +53,7 @@
#define HAVE_PTHREAD_YIELD_ZERARG 1
#define HAVE_BRKEN_REALPATH 1
+/* changes made to make use of LibC-June-2004 for building purpose */
#undef HAVE_PSIX_SIGNALS
#undef HAVE_PTHREAD_ATTR_SETSCPE
#undef HAVE_ALLC_A
@@ -62,6 +63,8 @@
#undef HAVE_PTHREAD_SETSCHEDPARAM
#undef HAVE_READLINK
#undef HAVE_STPCPY
+/* changes end */
+
/* no libc crypt() function */
#ifdef HAVEPENSSL
#define HAVE_CRYPT 1