Commit 05a3c0e8 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi
Browse files

Fixed shutdown problem on HPUX

parent 2dfa4555

Docs/manual.texi

+6 −0
Original line number Diff line number Diff line
@@ -46888,6 +46888,12 @@ not yet 100% confident in this code. 
@appendixsubsec Changes in release 3.23.47

@itemize @bullet

@item

InnoDB now supports @code{NULL} in keys.

@item

Fixed shutdown problem on HPUX. (Introduced in 3.23.46)

@item

Added 'DO expression' command.

@item

Fixed core-dump bug in replication when using SELECT RELEASE_LOCK();

@item

Added new statement DO expression,[expression].

mysql-test/r/innodb.result

+7 −7
Original line number Diff line number Diff line
@@ -111,11 +111,11 @@ id parent_id level 
1010	102	2

1015	102	2

table	type	possible_keys	key	key_len	ref	rows	Extra

t1	index	level	level	1	NULL	39	where used; Using index

t1	ref	level	level	1	const	12	where used; Using index

table	type	possible_keys	key	key_len	ref	rows	Extra

t1	index	level	level	1	NULL	39	where used; Using index

t1	ref	level	level	1	const	12	where used; Using index

table	type	possible_keys	key	key_len	ref	rows	Extra

t1	ref	level	level	1	const	12	

t1	ref	level	level	1	const	12	where used

level	id

1	1002

1	1003
@@ -133,9 +133,9 @@ level id parent_id 
Table	Op	Msg_type	Msg_text

test.t1	optimize	error	The handler for the table doesn't support check/repair

Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Comment

t1	0	PRIMARY	1	id	A	2	NULL	NULL	

t1	1	parent_id	1	parent_id	A	2	NULL	NULL	

t1	1	level	1	level	A	2	NULL	NULL	

t1	0	PRIMARY	1	id	A	87	NULL	NULL	

t1	1	parent_id	1	parent_id	A	21	NULL	NULL	

t1	1	level	1	level	A	4	NULL	NULL	

gesuchnr	benutzer_id

1	1

2	1
@@ -438,7 +438,7 @@ hello 1 
Table	Op	Msg_type	Msg_text

test.t1	optimize	error	The handler for the table doesn't support check/repair

Table	Non_unique	Key_name	Seq_in_index	Column_name	Collation	Cardinality	Sub_part	Packed	Comment

t1	0	PRIMARY	1	a	A	2	NULL	NULL	

t1	0	PRIMARY	1	a	A	1	NULL	NULL	

i	j

1	2

i	j

sql/mysqld.cc

+8 −1
Original line number Diff line number Diff line
@@ -610,13 +610,20 @@ void kill_mysql(void) 
  {

    DBUG_PRINT("error",("Got error %d from pthread_kill",errno)); /* purecov: inspected */

  }

#else

#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;

}