diff options
| author | unknown <peter@mysql.com> | 2002-08-04 13:51:17 +0400 |
|---|---|---|
| committer | unknown <peter@mysql.com> | 2002-08-04 13:51:17 +0400 |
| commit | 6c957a21e0dee2cc768fdd0fc9b79d8254a34c4b (patch) | |
| tree | d57a65b6ac44788faaf3fbc3bc147f8a64cb56b8 /sql/sql_parse.cc | |
| parent | 7dc0314443938321885a7cfc513a1ae83347cba9 (diff) | |
| parent | 3e82337c17ba8da98316e77c515932a07ba2bec7 (diff) | |
| download | mariadb-git-6c957a21e0dee2cc768fdd0fc9b79d8254a34c4b.tar.gz | |
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
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 69abe813eed..1d7987bbc2f 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -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) |