mirror of
https://github.com/MariaDB/server.git
synced 2026-01-06 05:22:24 +03:00
Merge mysql.com:/home/pz/mysql/mysql-4.0-root
into mysql.com:/home/pz/mysql/mysql-4.0 sql/sql_parse.cc: Auto merged
This commit is contained in:
@@ -706,8 +706,10 @@ pthread_handler_decl(handle_bootstrap,arg)
|
||||
thd->dbug_thread_id=my_thread_id();
|
||||
#if !defined(__WIN__) && !defined(OS2)
|
||||
sigset_t set;
|
||||
VOID(sigemptyset(&set)); // Get mask in use
|
||||
VOID(pthread_sigmask(SIG_UNBLOCK,&set,&thd->block_signals));
|
||||
VOID(sigemptyset(&set));
|
||||
VOID(sigaddset(&set,SIGINT));
|
||||
// Get mask in use and block SIGINT
|
||||
VOID(pthread_sigmask(SIG_BLOCK,&set,&thd->block_signals));
|
||||
#endif
|
||||
|
||||
if ((ulong) thd->variables.max_join_size == (ulong) HA_POS_ERROR)
|
||||
|
||||
Reference in New Issue
Block a user