1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed shutdown problem on HPUX

Browse Source 
Docs/manual.texi:
  Changelog
mysql-test/r/innodb.result:
  Update results after InnoDB optimizer changes.
This commit is contained in:
unknown 2001-12-21 06:54:58 +02:00
parent 9d9e0a08d7
commit 8ab263d18c
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Docs/manual.texi
View File

@ -46888,6 +46888,12 @@ not yet 100% confident in this code.
@appendixsubsec Changes in release 3.23.47 @appendixsubsec Changes in release 3.23.47
@itemize @bullet @itemize @bullet
@item @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(); Fixed core-dump bug in replication when using SELECT RELEASE_LOCK();
@item @item
Added new statement DO expression,[expression]. Added new statement DO expression,[expression].

14
mysql-test/r/innodb.result
View File

@ -111,11 +111,11 @@ id parent_id level
1010 102 2 1010 102 2
1015 102 2 1015 102 2
table type possible_keys key key_len ref rows Extra 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 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 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 level id
1 1002 1 1002
1 1003 1 1003
@ -133,9 +133,9 @@ level id parent_id
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 optimize error The handler for the table doesn't support check/repair 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 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 0 PRIMARY 1 id A 87 NULL NULL
t1 1 parent_id 1 parent_id A 2 NULL NULL t1 1 parent_id 1 parent_id A 21 NULL NULL
t1 1 level 1 level A 2 NULL NULL t1 1 level 1 level A 4 NULL NULL
gesuchnr benutzer_id gesuchnr benutzer_id
1 1 1 1
2 1 2 1
@ -438,7 +438,7 @@ hello 1
Table Op Msg_type Msg_text Table Op Msg_type Msg_text
test.t1 optimize error The handler for the table doesn't support check/repair 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 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 i j
1 2 1 2
i j i j

9
sql/mysqld.cc
View File

@ -610,13 +610,20 @@ void kill_mysql(void)
{ {
DBUG_PRINT("error",("Got error %d from pthread_kill",errno)); /* purecov: inspected */ 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); kill(current_pid,MYSQL_KILL_SIGNAL);
#endif #endif
DBUG_PRINT("quit",("After pthread_kill")); DBUG_PRINT("quit",("After pthread_kill"));
shutdown_in_progress=1; // Safety if kill didn't work shutdown_in_progress=1; // Safety if kill didn't work
#ifdef SIGNALS_DONT_BREAK_READ #ifdef SIGNALS_DONT_BREAK_READ
if (!abort_loop)
{
pthread_t tmp;
abort_loop=1; 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 #endif
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }