Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
ca004e9e
Commit
ca004e9e
authored
Apr 21, 2009
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
merged from trunk.
parents
928c506e
7e44eb89
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
sql/mysqld.cc
sql/mysqld.cc
+2
-2
sql/sql_string.cc
sql/sql_string.cc
+2
-2
sql/strfunc.cc
sql/strfunc.cc
+2
-1
No files found.
sql/mysqld.cc
View file @
ca004e9e
...
...
@@ -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
));
}
}
...
...
sql/sql_string.cc
View file @
ca004e9e
...
...
@@ -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
))))
...
...
sql/strfunc.cc
View file @
ca004e9e
...
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment