Update to new root alloc, OPTIMIZE TABLE and some other changes

Docs/manual.texi:
  Added chapter for binary log, updated the changelog, linux section, OPTIMIZE TABLE...
client/mysqladmin.c:
  Fixed bug with pid-file handling.
client/mysqldump.c:
  Version change
configure.in:
  Version change
include/Makefile.am:
  Fix for SCO to get sched.h removed.
include/global.h:
  Increased MY_NFILE;  Added thread_safe_increment
include/my_sys.h:
  Better root_alloc
include/mysql.h:
  Better root_alloc
include/mysys_err.h:
  Fix for PREAD/PWRITE on windows
libmysql/libmysql.c:
  Better root_alloc
myisam/mi_locking.c:
  Fix for PREAD/PWRITE on windows
myisam/mi_static.c:
  Fix for PREAD/PWRITE on windows
mysys/default.c:
  Better root_alloc
mysys/errors.c:
  Fix for PREAD/PWRITE on windows
mysys/my_alloc.c:
  Better root_alloc
mysys/my_create.c:
  Fix for PREAD/PWRITE on windows
mysys/my_fopen.c:
  Fix for PREAD/PWRITE on windows
mysys/my_open.c:
  Fix for PREAD/PWRITE on windows
mysys/my_pread.c:
  Fix for PREAD/PWRITE on windows
mysys/tree.c:
  Better root_alloc
readline/bind.c:
  Removed compiler warning
readline/isearch.c:
  Removed compiler warning
scripts/safe_mysqld.sh:
  Allow use of MYSQL_UNIX_PORT and MYSQL_TCP_PORT
sql-bench/crash-me.sh:
  Version change
sql-bench/limits/mysql-3.23.cfg:
  Update to latest MySQL version
sql/filesort.cc:
  Added more statistics
sql/ha_berkeley.h:
  Fixed bug with ORDER BY
sql/ha_myisam.cc:
  Added OPTIMIZE TABLE and cleaned up the repair code
sql/ha_myisam.h:
  Added OPTIMIZE TABLE and cleaned up the repair code
sql/handler.cc:
  Added OPTIMIZE TABLE and cleaned up the repair code
sql/handler.h:
  Added OPTIMIZE TABLE and cleaned up the repair code
sql/item_func.cc:
  Fixed comment
sql/item_timefunc.cc:
  Fixed possible month bug
sql/mini_client.cc:
  Use of new root_alloc
sql/mysql_priv.h:
  Added OPTIMIZE TABLE and cleaned up the repair code
sql/mysqld.cc:
  Added more statistics
sql/opt_range.cc:
  Use of new root_alloc
sql/slave.cc:
  Use of new root_alloc
sql/sql_acl.cc:
  Use of new root_alloc
sql/sql_class.cc:
  Use of new root_alloc
sql/sql_parse.cc:
  Use of new root_alloc
sql/sql_select.cc:
  Added more statistics
sql/sql_table.cc:
  Added OPTIMIZE TABLE and cleaned up the repair code
sql/sql_udf.cc:
  Use of new root_alloc
sql/sql_yacc.yy:
  Fixed that OPTIMIZE TABLE can take many tables as arguments
sql/table.cc:
  Use of new root_alloc
sql/thr_malloc.cc:
  Use of new root_alloc
support-files/mysql.server.sh:
  Removed usage of AWK

1 files changed, 32 insertions, 23 deletions

diff --git a/mysys/my_pread.c b/mysys/my_pread.c
index 1190f2cc81b..74bb7783af5 100644
--- a/mysys/my_pread.c
+++ b/mysys/my_pread.c
@@ -28,6 +28,7 @@ uint my_pread(File Filedes, byte *Buffer, uint Count, my_off_t offset,
 	      myf MyFlags)
 {
   uint readbytes;
+  int error;
   DBUG_ENTER("my_pread");
   DBUG_PRINT("my",("Fd: %d  Seek: %lu  Buffer: %lx  Count: %u  MyFlags: %d",
 		   Filedes, (ulong) offset, Buffer, Count, MyFlags));
@@ -38,32 +39,35 @@ uint my_pread(File Filedes, byte *Buffer, uint Count, my_off_t offset,
     errno=0;					/* Linux doesn't reset this */
 #endif
 #ifndef HAVE_PREAD
+    pthread_mutex_lock(&my_file_info[Filedes].mutex);
     readbytes= (uint) -1;
-    if (lseek(Filedes, offset, MY_SEEK_SET) == -1L ||
-	(readbytes = (uint) read(Filedes, Buffer, Count)) != Count)
+    error= (lseek(Filedes, offset, MY_SEEK_SET) == -1L ||
+	    (readbytes = (uint) read(Filedes, Buffer, Count)) != Count);
+    pthread_mutex_unlock(&my_file_info[Filedes].mutex);
 #else
-      if ((readbytes = (uint) pread(Filedes, Buffer, Count, offset)) != Count)
+    error=((readbytes = (uint) pread(Filedes, Buffer, Count, offset)) != Count);
 #endif
-      {
-	my_errno=errno;
-	DBUG_PRINT("warning",("Read only %ld bytes off %ld from %d, errno: %d",
-			      readbytes,Count,Filedes,my_errno));
+    if (error)
+    {
+      my_errno=errno;
+      DBUG_PRINT("warning",("Read only %ld bytes off %ld from %d, errno: %d",
+			    readbytes,Count,Filedes,my_errno));
 #ifdef THREAD
-	if (readbytes == 0 && errno == EINTR)
-	  continue;				/* Interrupted */
+      if (readbytes == 0 && errno == EINTR)
+	continue;				/* Interrupted */
 #endif
-	if (MyFlags & (MY_WME | MY_FAE | MY_FNABP))
-	{
-	  if ((int) readbytes == -1)
-	    my_error(EE_READ, MYF(ME_BELL+ME_WAITTANG),
-		     my_filename(Filedes),my_errno);
-	  else if (MyFlags & (MY_NABP | MY_FNABP))
-	    my_error(EE_EOFERR, MYF(ME_BELL+ME_WAITTANG),
-		     my_filename(Filedes),my_errno);
-	}
-	if ((int) readbytes == -1 || (MyFlags & (MY_FNABP | MY_NABP)))
-	  DBUG_RETURN(MY_FILE_ERROR);	/* Return with error */
+      if (MyFlags & (MY_WME | MY_FAE | MY_FNABP))
+      {
+	if ((int) readbytes == -1)
+	  my_error(EE_READ, MYF(ME_BELL+ME_WAITTANG),
+		   my_filename(Filedes),my_errno);
+	else if (MyFlags & (MY_NABP | MY_FNABP))
+	  my_error(EE_EOFERR, MYF(ME_BELL+ME_WAITTANG),
+		   my_filename(Filedes),my_errno);
       }
+      if ((int) readbytes == -1 || (MyFlags & (MY_FNABP | MY_NABP)))
+	DBUG_RETURN(MY_FILE_ERROR);	/* Return with error */
+    }
     if (MyFlags & (MY_NABP | MY_FNABP))
       DBUG_RETURN(0);			/* Ok vid l{sning */
     DBUG_RETURN(readbytes); /* purecov: inspected */
@@ -76,6 +80,7 @@ uint my_pread(File Filedes, byte *Buffer, uint Count, my_off_t offset,
 uint my_pwrite(int Filedes, const byte *Buffer, uint Count, my_off_t offset,
 	       myf MyFlags)
 {
+  int error;
   uint writenbytes,errors;
   ulong written;
   DBUG_ENTER("my_pwrite");
@@ -87,12 +92,16 @@ uint my_pwrite(int Filedes, const byte *Buffer, uint Count, my_off_t offset,
   {
 #ifndef HAVE_PREAD
     writenbytes= (uint) -1;
-    if (lseek(Filedes, offset, MY_SEEK_SET) != -1L &&
-	(writenbytes = (uint) write(Filedes, Buffer, Count)) == Count)
+    pthread_mutex_lock(&my_file_info[Filedes].mutex);
+    error=(lseek(Filedes, offset, MY_SEEK_SET) != -1L &&
+	   (writenbytes = (uint) write(Filedes, Buffer, Count)) == Count);
+    pthread_mutex_unlock(&my_file_info[Filedes].mutex);
+    if (error)
+      break;
 #else
     if ((writenbytes = (uint) pwrite(Filedes, Buffer, Count,offset)) == Count)
-#endif
       break;
+#endif
     if ((int) writenbytes != -1)
     {					/* Safegueard */
       written+=writenbytes;