database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Backported fix from 4.0 which caused core dumps for some complex queries.

Browse Source
This commit is contained in:
monty@hundin.mysql.fi
2002-06-17 15:00:06 +03:00
parent f4da1be1e1
commit 0762b00d86
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Docs/manual.texi
View File

@ -31150,7 +31150,7 @@ mysql> select TRUNCATE(1.999,1);
-> 1.9
mysql> select TRUNCATE(1.999,0);
-> 1
mysql> select TRUNCATE(-1,999,1);
mysql> select TRUNCATE(-1.999,1);
-> -1.9
@end example

7
sql/mysqld.cc
View File

@ -1121,7 +1121,8 @@ void end_thread(THD *thd, bool put_in_cache)
inline void kill_broken_server()
{
/* hack to get around signals ignored in syscalls for problem OS's */
if (unix_sock == INVALID_SOCKET || (!opt_disable_networking && ip_sock ==INVALID_SOCKET))
if (unix_sock == INVALID_SOCKET ||
(!opt_disable_networking && ip_sock == INVALID_SOCKET))
{
select_thread_in_use = 0;
kill_server((void*)MYSQL_KILL_SIGNAL); /* never returns */
@ -1592,8 +1593,8 @@ pthread_handler_decl(handle_shutdown,arg)
abort_loop = 1;
// unblock select()
so_cancel( ip_sock);
so_cancel( unix_sock);
so_cancel(ip_sock);
so_cancel(unix_sock);
return 0;
}

3
sql/opt_range.cc
View File

@ -1285,7 +1285,8 @@ and_all_keys(SEL_ARG *key1,SEL_ARG *key2,uint clone_flag)
}
if (key1->type == SEL_ARG::MAYBE_KEY)
{
key1->left= &null_element; key1->next=0;
key1->right= key1->left= &null_element;
key1->next= key1->prev= 0;
}
for (next=key1->first(); next ; next=next->next)
{