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

don't crash debug builds on "packets out of order"

Browse Source 
only do it in EXTRA_DEBUG builds
This commit is contained in:
Sergei Golubchik 2018-01-31 20:22:31 +01:00
parent f4414d4c4e
commit d6638586c6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sql/net_serv.cc
View File

@ -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 @@ packets_out_of_order:
("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));
DBUG_ASSERT(0); EXTRA_DEBUG_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