mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
Try to optimize the cache buffer size needed for bulk_insert
Fix for shutdown on Mac OS X include/my_tree.h: Try to optimize the cache buffer size needed for bulk_insert myisam/mi_write.c: Try to optimize the cache buffer size needed for bulk_insert mysql-test/r/bdb.result: Make test repeatable mysql-test/t/bdb.test: Make test repeatable mysys/tree.c: Try to optimize the cache buffer size needed for bulk_insert sql/mysql_priv.h: Small optimization sql/mysqld.cc: Fix for shutdown on Mac OS X sql/sql_insert.cc: Try to optimize the cache buffer size needed for bulk_insert sql/sql_yacc.yy: Call thd->strmake() instead of sql_strmake() sql/table.cc: Try to optimize the cache buffer size needed for bulk_insert sql/table.h: Try to optimize the cache buffer size needed for bulk_insert
This commit is contained in:
@@ -764,7 +764,7 @@ static void __cdecl kill_server(int sig_ptr)
|
||||
if (sig != MYSQL_KILL_SIGNAL && sig != 0)
|
||||
unireg_abort(1); /* purecov: inspected */
|
||||
else
|
||||
unireg_end(0);
|
||||
unireg_end();
|
||||
pthread_exit(0); /* purecov: deadcode */
|
||||
RETURN_FROM_KILL_SERVER;
|
||||
}
|
||||
@@ -803,12 +803,29 @@ extern "C" sig_handler print_signal_warning(int sig)
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
cleanup all memory and end program nicely
|
||||
|
||||
void unireg_end(int signal_number __attribute__((unused)))
|
||||
SYNOPSIS
|
||||
unireg_end()
|
||||
|
||||
NOTES
|
||||
This function never returns.
|
||||
|
||||
If SIGNALS_DONT_BREAK_READ is defined, this function is called
|
||||
by the main thread. To get MySQL to shut down nicely in this case
|
||||
(Mac OS X) we have to call exit() instead if pthread_exit().
|
||||
*/
|
||||
|
||||
void unireg_end(void)
|
||||
{
|
||||
clean_up();
|
||||
my_thread_end();
|
||||
#ifdef SIGNALS_DONT_BREAK_READ
|
||||
exit(0);
|
||||
#else
|
||||
pthread_exit(0); // Exit is in main thread
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user