Merge with 3.23.42

configure.in:
  Auto merged
BitKeeper/deleted/.del-violite.c~d7b85be615595ace:
  Auto merged
BitKeeper/deleted/.del-violite.c~984c09cffe14a11b:
  Auto merged
client/Makefile.am:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqlbinlog.cc:
  Auto merged
heap/hp_test2.c:
  Auto merged
include/global.h:
  Auto merged
include/my_pthread.h:
  Auto merged
include/myisam.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
libmysql/net.c:
  Auto merged
myisam/sort.c:
  Auto merged
sql-bench/test-create.sh:
  Auto merged
sql/handler.cc:
  Auto merged
sql/handler.h:
  Auto merged
sql/lock.cc:
  Auto merged
sql/log_event.cc:
  Auto merged
sql/mini_client.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/net_serv.cc:
  Auto merged
mysql-test/t/merge.test:
  Auto merged
sql/ha_innobase.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_lex.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
support-files/mysql.spec.sh:
  Auto merged
mysql-test/t/bdb.test:
  Auto merged
Docs/manual.texi:
  merge
myisam/myisampack.c:
  merge

2 files changed, 1 insertions, 40 deletions

diff --git a/mysys/my_write.c b/mysys/my_write.c
index 640043192ef..5d5a48a3dda 100644
--- a/mysys/my_write.c
+++ b/mysys/my_write.c
@@ -19,45 +19,6 @@
 #include "mysys_err.h"
 #include <errno.h>
 
-#ifdef OS2
-
-int      _write64( int fd, const void *buffer, unsigned int count)
-{
-   APIRET   rc;
-   ULONG    actual;
-
-   rc = DosWrite( fd, (PVOID) buffer, count, &actual);
-
-   switch (rc) {
-   case 0:  /* NO_ERROR */
-      errno = 0;
-      return( actual);
-      break;
-   case ERROR_INVALID_FUNCTION:
-      errno = EPERM;
-      break;
-   case ERROR_ACCESS_DENIED:
-      errno = EACCESS;
-      break;
-   case ERROR_INVALID_HANDLE:
-      errno = EBADF;
-      break;
-   case ERROR_DISK_FULL:
-      errno = ENOSPC;
-      break;
-   default:
-      errno = EINVAL;
-      break;
-   }
-   // write failed
-   return(-1);
-}
-
-// redirect call
-#define write _write64
-
-#endif // OS2
-
 
 	/* Write a chunk of bytes to a file */
 
diff --git a/mysys/thr_lock.c b/mysys/thr_lock.c
index d2b3960d6b5..10c803378df 100644
--- a/mysys/thr_lock.c
+++ b/mysys/thr_lock.c
@@ -736,7 +736,7 @@ void thr_unlock(THR_LOCK_DATA *data)
 			     data->type == TL_WRITE_ALLOW_WRITE));
       else
       {
-	DBUG_PRINT("lock",("No locks to free"));
+	DBUG_PRINT("lock",("No waiting read locks to free"));
       }
     }
     else if (data &&