Commit 8a9c521b authored by unknown's avatar unknown
Browse files

Merge chilla.local:/home/mydev/mysql-4.1-axmrg 

into  chilla.local:/home/mydev/mysql-5.0-axmrg


sql/handler.cc:
  Auto merged
sql/examples/ha_tina.cc:
  Auto merged
sql/examples/ha_tina.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
mysql-test/Makefile.am:
  Manual merged
parents 3c0aca02 0dc19dad

sql/examples/ha_tina.cc

+12 −0
Original line number Diff line number Diff line
@@ -276,6 +276,18 @@ bool tina_end() 
  return FALSE;

}



bool tina_end()

{

  if (tina_init)

  {

    hash_free(&tina_open_tables);

    VOID(pthread_mutex_destroy(&tina_mutex));

  }

  tina_init= 0;

  return FALSE;

}





/* 

  Finds the end of a line.

  Currently only supports files written on a UNIX OS.

sql/mysqld.cc

+4 −0
Original line number Diff line number Diff line
@@ -3349,7 +3349,11 @@ int main(int argc, char **argv) 
  DEBUGGER_OFF;



  /* Set signal used to kill MySQL */

#if defined(SIGUSR2)

  thr_kill_signal= thd_lib_detected == THD_LIB_LT ? SIGINT : SIGUSR2;

#else

  thr_kill_signal= SIGINT;

#endif



#ifdef _CUSTOMSTARTUPCONFIG_

  if (_cust_check_startup())