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

merged from trunk.

Browse Source
This commit is contained in:
unknown 2009-04-21 12:26:24 +02:00
commit ca004e9ec5
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/mysqld.cc
View File

@ -4975,11 +4975,11 @@ inline void kill_broken_server()
#if !defined(__NETWARE__) #if !defined(__NETWARE__)
unix_sock == INVALID_SOCKET || unix_sock == INVALID_SOCKET ||
#endif #endif
(!opt_disable_networking && (!opt_disable_networking && base_ip_sock == INVALID_SOCKET))
(base_ip_sock == INVALID_SOCKET || extra_ip_sock != INVALID_SOCKET)))
{ {
select_thread_in_use = 0; select_thread_in_use = 0;
/* The following call will never return */ /* The following call will never return */
DBUG_PRINT("general", ("killing server because socket is closed"));
kill_server(IF_NETWARE(MYSQL_KILL_SIGNAL, (void*) MYSQL_KILL_SIGNAL)); kill_server(IF_NETWARE(MYSQL_KILL_SIGNAL, (void*) MYSQL_KILL_SIGNAL));
} }
} }

4
sql/sql_string.cc
View File

@ -65,10 +65,10 @@ bool String::real_alloc(uint32 arg_length)
bool String::realloc(uint32 alloc_length) bool String::realloc(uint32 alloc_length)
{ {
uint32 len=ALIGN_SIZE(alloc_length+1); if (Alloced_length <= alloc_length)
if (Alloced_length < len)
{ {
char *new_ptr; char *new_ptr;
uint32 len= ALIGN_SIZE(alloc_length+1);
if (alloced) if (alloced)
{ {
if ((new_ptr= (char*) my_realloc(Ptr,len,MYF(MY_WME)))) if ((new_ptr= (char*) my_realloc(Ptr,len,MYF(MY_WME))))

3
sql/strfunc.cc
View File

@ -38,7 +38,8 @@
static const char field_separator=','; static const char field_separator=',';
ulonglong find_set(TYPELIB *lib, const char *str, uint length, CHARSET_INFO *cs, ulonglong find_set(TYPELIB *lib, const char *str, uint length,
CHARSET_INFO *cs,
char **err_pos, uint *err_len, bool *set_warning) char **err_pos, uint *err_len, bool *set_warning)
{ {
CHARSET_INFO *strip= cs ? cs : &my_charset_latin1; CHARSET_INFO *strip= cs ? cs : &my_charset_latin1;