diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-04-21 12:26:24 +0200 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-04-21 12:26:24 +0200 |
| commit | ca004e9ec53981a106cea6c0fab450d5d38a70f2 (patch) | |
| tree | 25fcbb40b6adf0eb3e45dc90480269acc66bb374 | |
| parent | 928c506ed93fc8f81efea8d2e8771176c8313730 (diff) | |
| parent | 7e44eb89a0eef0200449d11af73def41c6fa817b (diff) | |
| download | mariadb-git-ca004e9ec53981a106cea6c0fab450d5d38a70f2.tar.gz | |
merged from trunk.
| -rw-r--r-- | sql/mysqld.cc | 4 | ||||
| -rw-r--r-- | sql/sql_string.cc | 4 | ||||
| -rw-r--r-- | sql/strfunc.cc | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 98d62bc0e04..7a988f1cbad 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -4975,11 +4975,11 @@ inline void kill_broken_server() #if !defined(__NETWARE__) unix_sock == INVALID_SOCKET || #endif - (!opt_disable_networking && - (base_ip_sock == INVALID_SOCKET || extra_ip_sock != INVALID_SOCKET))) + (!opt_disable_networking && base_ip_sock == INVALID_SOCKET)) { select_thread_in_use = 0; /* 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)); } } diff --git a/sql/sql_string.cc b/sql/sql_string.cc index 34b310931d6..4b2450c0093 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -65,10 +65,10 @@ bool String::real_alloc(uint32 arg_length) bool String::realloc(uint32 alloc_length) { - uint32 len=ALIGN_SIZE(alloc_length+1); - if (Alloced_length < len) + if (Alloced_length <= alloc_length) { char *new_ptr; + uint32 len= ALIGN_SIZE(alloc_length+1); if (alloced) { if ((new_ptr= (char*) my_realloc(Ptr,len,MYF(MY_WME)))) diff --git a/sql/strfunc.cc b/sql/strfunc.cc index c03365cfc2b..d6f9784e4ad 100644 --- a/sql/strfunc.cc +++ b/sql/strfunc.cc @@ -38,7 +38,8 @@ 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) { CHARSET_INFO *strip= cs ? cs : &my_charset_latin1; |