Fixes for Netware

Call pthread_mutex_destroy() on not used mutex.
Changed comments in .h and .c files from // -> /* */
Added detection of mutex on which one didn't call pthread_mutex_destroy()
Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression"
Added optimisation for ORDER BY NULL


BitKeeper/deleted/.del-ChangeLog~dfc92e15bee6fc75:
  Delete: sql/ChangeLog
BUILD/compile-pentium-valgrind-max:
  Don't use valgrind with safemalloc as this can hide some bugs
Makefile.am:
  Added platform dirs
bdb/os/os_handle.c:
  Portability fix
client/mysql.cc:
  Fixes for Netware.
  Fixed duplicate output when using 'tee'
  Simple optimisations
client/mysqldump.c:
  Portability fix
client/mysqltest.c:
  Portability fix
configure.in:
  Fixes for Netware
extra/resolveip.c:
  Fixes for Netware
include/Makefile.am:
  Fixes for Netware
include/config-win.h:
  Portability fix
include/my_global.h:
  Fixes for Netware
include/my_net.h:
  Fixes for Netware
include/my_pthread.h:
  Fixes for Netware
  Added detection of mutexes that was not destroyed
include/my_sys.h:
  Fixes for Netware
  Added 'extern' before external functions
include/mysql.h:
  Fixes for Netware
innobase/configure.in:
  Fixes for Netware
innobase/include/os0thread.h:
  Fixes for Netware
innobase/os/os0sync.c:
  Fixes for Netware
innobase/os/os0thread.c:
  Fixes for Netware
innobase/srv/srv0srv.c:
  Fixes for Netware
innobase/srv/srv0start.c:
  Fixes for Netware
innobase/sync/sync0sync.c:
  Fixes for Netware
isam/test3.c:
  Disable test on Netware
libmysql/Makefile.shared:
  Added my_sleep
libmysql/get_password.c:
  Fixes for Netware
libmysql/libmysql.c:
  Fixes for Netware
  Made mysql_once_init() global
libmysql/manager.c:
  Fixes for Netware
myisam/mi_test3.c:
  Disable test for netware
mysql-test/mysql-test-run.sh:
  Give warning if output file contains errors
mysql-test/r/count_distinct.result:
  More tests
mysql-test/r/group_by.result:
  Test of ORDER BY NULL
mysql-test/t/backup.test:
  Fixes for Netware
mysql-test/t/count_distinct.test:
  More tests
mysql-test/t/func_crypt.test:
  Fixes for Netware
mysql-test/t/grant_cache.test:
  Fixes for Netware
mysql-test/t/group_by.test:
  Tests of ORDER BY NULL
mysql-test/t/rpl000015.test:
  Fixes for Netware
mysql-test/t/rpl000017.test:
  Fixes for Netware
mysql-test/t/rpl_rotate_logs.test:
  Fixes for Netware
mysys/Makefile.am:
  Added my_sleep.c and my_netware.c
mysys/charset.c:
  Fixes for Netware
mysys/default.c:
  Fixes for Netware
mysys/mf_tempfile.c:
  Fixes for Netware
mysys/my_clock.c:
  Fixes for Netware
mysys/my_copy.c:
  Fixes for Netware
mysys/my_getwd.c:
  Changed function comment from // -> /* */
mysys/my_init.c:
  Fixes for Netware
mysys/my_lock.c:
  Fixes for Netware
mysys/my_messnc.c:
  Fixes for Netware
mysys/my_os2cond.c:
  Removed comment
mysys/my_os2dirsrch.c:
  Changed function comment from // -> /* */
  Fixed indentation
mysys/my_os2dirsrch.h:
  Changed function comment from // -> /* */
  Fixed indentation
mysys/my_os2file64.c:
  Changed function comment from // -> /* */
  Fixed indentation
mysys/my_os2mutex.c:
  Changed function comment from // -> /* */
  Fixed indentation
mysys/my_os2thread.c:
  Changed function comment from // -> /* */
  Fixed indentation
mysys/my_os2tls.c:
  Changed function comment from // -> /* */
  Fixed indentation
mysys/my_pthread.c:
  Fixes for Netware
mysys/my_redel.c:
  Fixes for Netware
mysys/my_tempnam.c:
  Fixes for Netware
mysys/my_thr_init.c:
  Remove created mutexes when program ends.
mysys/mysys_priv.h:
  Cleanup
mysys/safemalloc.c:
  Prefix error messages with "Error:"
mysys/thr_alarm.c:
  Destroy internal mutex on end_thr_alarm.
mysys/thr_mutex.c:
  Added detection of mutex on which one didn't call pthread_mutex_destroy()
scripts/make_binary_distribution.sh:
  Fixes for Netware
sql/des_key_file.cc:
  Free mutex at end
sql/ha_innodb.cc:
  Free mutex at end
sql/ha_myisam.cc:
  Changed warnings from REPAIR Note:
  (For mysql-test-run)
sql/hostname.cc:
  Fixes for Netware
sql/item.h:
  Fixed bug in create_tmp_field() which causes a memory overrun
sql/item_func.cc:
  Free used mutexes
sql/item_sum.cc:
  Fixed bug in create_tmp_field() which causes a memory overrun
sql/log.cc:
  Free used mutexes
sql/my_lock.c:
  Fixes for Netware
sql/mysql_priv.h:
  Fixes for Netware
sql/mysqld.cc:
  Fixes for Netware
  Added Have_crypt
  Properly free mutexes from MYSQL_LOG by calling cleanup
  Free mutex before exit
sql/repl_failsafe.cc:
  Fixes for Netware
sql/set_var.cc:
  Added have_crypt
sql/share/english/errmsg.txt:
  Added version socket and port to stderr log
sql/slave.cc:
  Remove global MASTER_INFO variable and use instead an allocated variable.
  This allows us to correctly free used mutex.
sql/slave.h:
  Move constructors and destuctors to slave.cc
  (To make it easier to clear all needed variables)
sql/sql_base.cc:
  Safety fix
sql/sql_class.h:
  Portability fixes.
  Added 'cleanup' to log handling to be able to free mutexes.
sql/sql_insert.cc:
  Fixes for Netware
mysys/my_sleep.c:
  E
sql/sql_parse.cc:
  Fixes for Netware
sql/sql_select.cc:
  Added optimisation for ORDER BY NULL
sql/sql_select.h:
  Fixed bug in create_tmp_field() which causes a memory overrun
sql/sql_table.cc:
  Fixed bug in create_tmp_field() which causes a memory overrun
sql/sql_udf.cc:
  Free mutex on end
vio/test-ssl.c:
  Simple code cleanup
vio/test-sslclient.c:
  Simple code cleanup
vio/test-sslserver.c:
  Simple code cleanup
vio/viotest-ssl.c:
  Simple code cleanup

1 files changed, 104 insertions, 97 deletions

diff --git a/mysys/my_os2tls.c b/mysys/my_os2tls.c
index 1598fa34e2b..f7cf3b09283 100644
--- a/mysys/my_os2tls.c
+++ b/mysys/my_os2tls.c
@@ -30,115 +30,122 @@ PULONG		 tls_storage;	/* TLS local storage */
 DWORD		 tls_bits[2];	/* TLS in-use bits   */
 pthread_mutex_t  tls_mutex;	/* TLS mutex for in-use bits */
 
+
 DWORD	 TlsAlloc( void)
 {
-   DWORD index = -1;
-   DWORD mask, tibidx;
-   int	 i;
-
-   if (tls_storage == NULL) {
-
-      APIRET rc;
-
-      // allocate memory for TLS storage
-      rc = DosAllocThreadLocalMemory( 1, &tls_storage);
-      if (rc) {
-	 fprintf( stderr, "DosAllocThreadLocalMemory error: return code = %u\n", rc);
-      }
-
-      // create a mutex
-      if (pthread_mutex_init( &tls_mutex, NULL))
-	 fprintf( stderr, "Failed to init TLS mutex\n");
-   }
-
-   pthread_mutex_lock( &tls_mutex);
-
-   tibidx = 0;
-   if (tls_bits[0] == 0xFFFFFFFF) {
-      if (tls_bits[1] == 0xFFFFFFFF) {
-	    fprintf( stderr, "tid#%d, no more TLS bits available\n", _threadid);
-	    pthread_mutex_unlock( &tls_mutex);
-	    return -1;
-      }
-      tibidx = 1;
-   }
-   for( i=0; i<32; i++) {
-      mask = (1 << i);
-      if ((tls_bits[ tibidx] & mask) == 0) {
-	 tls_bits[ tibidx] |= mask;
-	 index = (tibidx*32) + i;
-	 break;
-      }
-   }
-   tls_storage[index] = 0;
-
-   pthread_mutex_unlock( &tls_mutex);
-
-   //fprintf( stderr, "tid#%d, TlsAlloc index %d\n", _threadid, index);
-
-   return index;
+  DWORD index = -1;
+  DWORD mask, tibidx;
+  int	 i;
+
+  if (tls_storage == NULL)
+  {
+
+    APIRET rc;
+
+    /* allocate memory for TLS storage */
+    rc = DosAllocThreadLocalMemory( 1, &tls_storage);
+    if (rc)
+      fprintf( stderr, "DosAllocThreadLocalMemory error: return code = %u\n",
+	       rc);
+    /* create a mutex */
+    if (pthread_mutex_init( &tls_mutex, NULL))
+      fprintf( stderr, "Failed to init TLS mutex\n");
+  }
+
+  pthread_mutex_lock( &tls_mutex);
+
+  tibidx = 0;
+  if (tls_bits[0] == 0xFFFFFFFF)
+  {
+    if (tls_bits[1] == 0xFFFFFFFF)
+    {
+      fprintf( stderr, "tid#%d, no more TLS bits available\n", _threadid);
+      pthread_mutex_unlock( &tls_mutex);
+      return -1;
+    }
+    tibidx = 1;
+  }
+
+  for (i=0; i<32; i++)
+  {
+    mask = (1 << i);
+    if ((tls_bits[ tibidx] & mask) == 0)
+    {
+      tls_bits[ tibidx] |= mask;
+      index = (tibidx*32) + i;
+      break;
+    }
+  }
+  tls_storage[index] = 0;
+
+  pthread_mutex_unlock( &tls_mutex);
+  /* fprintf( stderr, "tid#%d, TlsAlloc index %d\n", _threadid, index); */
+  return index;
 }
 
-BOOL	 TlsFree( DWORD index)
+BOOL TlsFree( DWORD index)
 {
-   int	  tlsidx;
-   DWORD  mask;
-
-   if (index >= TLS_MINIMUM_AVAILABLE)
-      return NULL;
-
-   pthread_mutex_lock( &tls_mutex);
-
-   tlsidx = 0;
-   if (index > 32) {
-      tlsidx++;
-   }
-   mask = (1 << index);
-   if (tls_bits[ tlsidx] & mask) {
-      tls_bits[tlsidx] &= ~mask;
-      tls_storage[index] = 0;
-      pthread_mutex_unlock( &tls_mutex);
-      return TRUE;
-   }
+  int	  tlsidx;
+  DWORD  mask;
 
-   pthread_mutex_unlock( &tls_mutex);
-   return FALSE;
-}
+  if (index >= TLS_MINIMUM_AVAILABLE)
+    return NULL;
 
+  pthread_mutex_lock( &tls_mutex);
 
-PVOID	 TlsGetValue( DWORD index)
-{
-   if (index >= TLS_MINIMUM_AVAILABLE)
-      return NULL;
-
-   // verify if memory has been allocated for this thread
-   if (*tls_storage == NULL) {
-      // allocate memory for indexes
-      *tls_storage = (ULONG)calloc( TLS_MINIMUM_AVAILABLE, sizeof(int));
-      //fprintf( stderr, "tid#%d, tls_storage %x\n", _threadid, *tls_storage);
-   }
-
-   ULONG* tls_array = (ULONG*) *tls_storage;
-   return (PVOID) tls_array[ index];
+  tlsidx = 0;
+  if (index > 32)
+    tlsidx++;
+
+  mask = (1 << index);
+  if (tls_bits[ tlsidx] & mask)
+  {
+    tls_bits[tlsidx] &= ~mask;
+    tls_storage[index] = 0;
+    pthread_mutex_unlock( &tls_mutex);
+    return TRUE;
+  }
+
+  pthread_mutex_unlock( &tls_mutex);
+  return FALSE;
 }
 
-BOOL	 TlsSetValue( DWORD index, PVOID val)
-{
 
-   // verify if memory has been allocated for this thread
-   if (*tls_storage == NULL) {
-      // allocate memory for indexes
-      *tls_storage = (ULONG)calloc( TLS_MINIMUM_AVAILABLE, sizeof(int));
-      //fprintf( stderr, "tid#%d, tls_storage %x\n", _threadid, *tls_storage);
-   }
+PVOID TlsGetValue( DWORD index)
+{
+  if (index >= TLS_MINIMUM_AVAILABLE)
+    return NULL;
+
+  /* verify if memory has been allocated for this thread */
+  if (*tls_storage == NULL)
+  {
+    /* allocate memory for indexes */
+    *tls_storage = (ULONG)calloc( TLS_MINIMUM_AVAILABLE, sizeof(int));
+    /* fprintf(stderr, "tid#%d, tls_storage %x\n", _threadid, *tls_storage); */
+  }
+
+  ULONG* tls_array = (ULONG*) *tls_storage;
+  return (PVOID) tls_array[index];
+}
 
-   if (index >= TLS_MINIMUM_AVAILABLE)
-      return FALSE;
 
-   ULONG* tls_array = (ULONG*) *tls_storage;
-   //fprintf( stderr, "tid#%d, TlsSetValue array %08x index %d -> %08x (old)\n", _threadid, tls_array, index, tls_array[ index]);
-   tls_array[ index] = (ULONG) val;
-   //fprintf( stderr, "tid#%d, TlsSetValue array %08x index %d -> %08x\n", _threadid, tls_array, index, val);
+BOOL TlsSetValue( DWORD index, PVOID val)
+{
 
-   return TRUE;
+  /* verify if memory has been allocated for this thread */
+  if (*tls_storage == NULL)
+  {
+    /* allocate memory for indexes */
+    *tls_storage = (ULONG)calloc( TLS_MINIMUM_AVAILABLE, sizeof(int));
+    /* fprintf(stderr, "tid#%d, tls_storage %x\n", _threadid, *tls_storage); */
+  }
+
+  if (index >= TLS_MINIMUM_AVAILABLE)
+    return FALSE;
+
+  ULONG* tls_array = (ULONG*) *tls_storage;
+  /* fprintf( stderr, "tid#%d, TlsSetValue array %08x index %d -> %08x (old)\n", _threadid, tls_array, index, tls_array[ index]); */
+  tls_array[ index] = (ULONG) val;
+  /* fprintf( stderr, "tid#%d, TlsSetValue array %08x index %d -> %08x\n", _threadid, tls_array, index, val); */
+  return TRUE;
 }