database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-01-06 05:22:24 +03:00
Code Activity

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

Browse Source 
into  chilla.local:/home/mydev/mysql-5.0-axmrg
This commit is contained in:
istruewing@chilla.local
2007-02-02 23:05:46 +01:00
parent 41b6b32ef7 972df14cc6
commit 77e99fe2ce
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/examples/ha_tina.cc
View File

@@ -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.

4
sql/mysqld.cc
View File

@@ -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())