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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
d6638586
Commit
d6638586
authored
Jan 31, 2018
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
don't crash debug builds on "packets out of order"
only do it in EXTRA_DEBUG builds
parent
f4414d4c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
sql/net_serv.cc
sql/net_serv.cc
+3
-1
No files found.
sql/net_serv.cc
View file @
d6638586
...
@@ -58,9 +58,11 @@
...
@@ -58,9 +58,11 @@
#ifdef EXTRA_DEBUG
#ifdef EXTRA_DEBUG
#define EXTRA_DEBUG_fprintf fprintf
#define EXTRA_DEBUG_fprintf fprintf
#define EXTRA_DEBUG_fflush fflush
#define EXTRA_DEBUG_fflush fflush
#define EXTRA_DEBUG_ASSERT DBUG_ASSERT
#else
#else
static
void
inline
EXTRA_DEBUG_fprintf
(...)
{}
static
void
inline
EXTRA_DEBUG_fprintf
(...)
{}
static
int
inline
EXTRA_DEBUG_fflush
(...)
{
return
0
;
}
static
int
inline
EXTRA_DEBUG_fflush
(...)
{
return
0
;
}
#define EXTRA_DEBUG_ASSERT(X) do {} while(0)
#endif
#endif
#ifdef MYSQL_SERVER
#ifdef MYSQL_SERVER
#define MYSQL_SERVER_my_error my_error
#define MYSQL_SERVER_my_error my_error
...
@@ -1071,7 +1073,7 @@ my_real_read(NET *net, size_t *complen,
...
@@ -1071,7 +1073,7 @@ my_real_read(NET *net, size_t *complen,
(
"Packets out of order (Found: %d, expected %u)"
,
(
"Packets out of order (Found: %d, expected %u)"
,
(
int
)
net
->
buff
[
net
->
where_b
+
3
],
(
int
)
net
->
buff
[
net
->
where_b
+
3
],
net
->
pkt_nr
));
net
->
pkt_nr
));
D
BUG_ASSERT
(
0
);
EXTRA_DE
BUG_ASSERT
(
0
);
/*
/*
We don't make noise server side, since the client is expected
We don't make noise server side, since the client is expected
to break the protocol for e.g. --send LOAD DATA .. LOCAL where
to break the protocol for e.g. --send LOAD DATA .. LOCAL where
...
...
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