bk commit into 5.1 tree (kaa:1.2518)

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
5.1 repository of kaa. When kaa 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://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-05-29 17:21:04+04:00, kaa@stripped +1 -0
  Merge polly.local:/home/kaa/src/maint/bug24611/my51-bug24611
  into  polly.local:/home/kaa/src/maint/mysql-5.1-maint
  MERGE: 1.2511.1.1

  sql/mysqld.cc@stripped, 2007-05-29 17:20:59+04:00, kaa@stripped +0 -0
    Auto merged
    MERGE: 1.646.1.1

# 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:	kaa
# Host:	polly.local
# Root:	/home/kaa/src/maint/mysql-5.1-maint/RESYNC

--- 1.647/sql/mysqld.cc	2007-05-28 15:36:13 +04:00
+++ 1.648/sql/mysqld.cc	2007-05-29 17:20:59 +04:00
@@ -2217,6 +2217,16 @@ later when used with nscd), disable LDAP
 mysqld that is not statically linked.\n");
 #endif
 
+#ifdef HAVE_NPTL
+  if (thd_lib_detected == THD_LIB_LT && !getenv("LD_ASSUME_KERNEL"))
+    fprintf(stderr,"\n\
+You are running a statically-linked LinuxThreads binary on an NPTL system.\n\
+This can result in crashes on some distributions due to LT/NPTL conflicts.\n\
+You should either build a dynamically-linked binary, or force LinuxThreads\n\
+to be used with the LD_ASSUME_KERNEL environment variable. Please consult\n\
+the documentation for your distribution on how to do that.\n");
+#endif
+  
   if (locked_in_memory)
   {
     fprintf(stderr, "\n\