Commit dead2d35 authored by tim@white.box's avatar tim@white.box
Browse files

Merge work.mysql.com:/home/bk/mysql-4.0 into white.box:/home/tim/my/4

parents 7d97d67f 2f190f67

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -392,3 +392,4 @@ tags 
tmp/*

vio/viotest-ssl

=6

libmysqld/ha_innobase.cc

libmysqld/Makefile.am

+2 −2
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ libmysqlsources = errmsg.c get_password.c password.c 
libmysqlobjects = errmsg.lo get_password.lo password.lo



sqlsources = convert.cc derror.cc field.cc field_conv.cc filesort.cc \

	ha_berkeley.cc ha_heap.cc ha_isam.cc ha_isammrg.cc \

	ha_innobase.cc ha_berkeley.cc ha_heap.cc ha_isam.cc ha_isammrg.cc \

	ha_myisam.cc ha_myisammrg.cc handler.cc sql_handler.cc \

	hostname.cc init.cc \

	item.cc item_buff.cc item_cmpfunc.cc item_create.cc \
@@ -58,7 +58,7 @@ sqlsources = convert.cc derror.cc field.cc field_conv.cc filesort.cc \ 


## XXX: we should not have to duplicate info from the sources list

sqlobjects = convert.lo derror.lo field.lo field_conv.lo filesort.lo \

	ha_berkeley.lo ha_heap.lo ha_isam.lo ha_isammrg.lo \

	ha_innobase.lo ha_berkeley.lo ha_heap.lo ha_isam.lo ha_isammrg.lo \

	ha_myisam.lo ha_myisammrg.lo handler.lo sql_handler.lo \

	hostname.lo init.lo \

	item.lo item_buff.lo item_cmpfunc.lo item_create.lo \

libmysqld/lib_sql.cc

+10 −10
Original line number Diff line number Diff line
@@ -564,8 +564,7 @@ void mysql_server_init(int argc, char **argv, const char **groups) 
    sql_print_error("Can't create thread-keys");

    exit(1);

  }

//  init_signals();				// Creates pidfile

//SWSOFT+

  //init_signals();

  opt_noacl = 1;

  if (acl_init(opt_noacl))

  {
@@ -640,13 +639,14 @@ void mysql_server_end() 
  sql_print_error("After lock_thread_count");

#endif



  /* Wait until cleanup is done */

  (void) pthread_mutex_lock(&LOCK_thread_count);

  while (!ready_to_exit)

  {

    pthread_cond_wait(&COND_thread_count,&LOCK_thread_count);

  }

  (void) pthread_mutex_unlock(&LOCK_thread_count);

//  /* Wait until cleanup is done */

//  (void) pthread_mutex_lock(&LOCK_thread_count);

//  while (!ready_to_exit)

//  {

//    pthread_cond_wait(&COND_thread_count,&LOCK_thread_count);

//  }

//  (void) pthread_mutex_unlock(&LOCK_thread_count);

  unireg_end(0);

  my_thread_end();

}

sql/mini_client.cc

+5 −0
Original line number Diff line number Diff line
@@ -40,6 +40,11 @@ 
#include "mysqld_error.h"

#include "errmsg.h"



#ifdef EMBEDDED_LIBRARY

#define net_read_timeout net_read_timeout1

#define net_write_timeout net_write_timeout1

#endif



extern ulong net_read_timeout;



extern "C" {					// Because of SCO 3.2V4.2