After applying your patch to my copy of 3.23.46, I get
mysqld.cc: In function `void kill_mysql()':
mysqld.cc:622: `kill_server_thread' undeclared (first use this function)
mysqld.cc:622: (Each undeclared identifier is reported only once
mysqld.cc:622: for each function it appears in.)
mysqld.cc: In function `void * kill_server_thread(void *)':
cc1plus: previous non-function declaration ` /* decl error */ '
mysqld.cc:674: conflicts with function declaration `void *
kill_server_thread(void *)'
make[3]: *** [mysqld.o] Error 1
make[3]: Leaving directory `/scr/src/mysql-3.23.46/sql'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/scr/src/mysql-3.23.46/sql'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/scr/src/mysql-3.23.46'
make: *** [all-recursive-am] Error 2
when I run make.
Michael
On Thu, 20 Dec 2001, Michael Widenius wrote:
>
<CUT>
> Here is a patch for this.
>
> ===== sql/mysqld.cc 1.222 vs edited =====
> *** /tmp/mysqld.cc-1.222-5078 Sat Dec 15 04:40:08 2001
> --- edited/sql/mysqld.cc Tue Dec 18 12:49:42 2001
> ***************
> *** 610,622 ****
> {
> DBUG_PRINT("error",("Got error %d from pthread_kill",errno)); /* purecov:
>inspected */
> }
> ! #else
> kill(current_pid,MYSQL_KILL_SIGNAL);
> #endif
> DBUG_PRINT("quit",("After pthread_kill"));
> shutdown_in_progress=1; // Safety if kill didn't work
> #ifdef SIGNALS_DONT_BREAK_READ
> abort_loop=1;
> #endif
> DBUG_VOID_RETURN;
> }
> --- 610,629 ----
> {
> DBUG_PRINT("error",("Got error %d from pthread_kill",errno)); /* purecov:
>inspected */
> }
> ! #elif !defined(SIGNALS_DONT_BREAK_READ)
> kill(current_pid,MYSQL_KILL_SIGNAL);
> #endif
> DBUG_PRINT("quit",("After pthread_kill"));
> shutdown_in_progress=1; // Safety if kill didn't work
> #ifdef SIGNALS_DONT_BREAK_READ
> + if (!abort_loop)
> + {
> + pthread_t tmp;
> abort_loop=1;
> + if (pthread_create(&tmp,&connection_attrib, kill_server_thread,
> + (void*) 0))
> + sql_print_error("Error: Can't create thread to kill server");
> + }
> #endif
> DBUG_VOID_RETURN;
> }
>
> Regards,
> Monty
>
---------------------------------------------------------------------
Before posting, please check:
http://www.mysql.com/manual.php (the manual)
http://lists.mysql.com/ (the list archive)
To request this thread, e-mail <[EMAIL PROTECTED]>
To unsubscribe, e-mail <[EMAIL PROTECTED]>
Trouble unsubscribing? Try: http://lists.mysql.com/php/unsubscribe.php
