Commit d6638586 authored by Sergei Golubchik's avatar Sergei Golubchik

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

only do it in EXTRA_DEBUG builds
parent f4414d4c
...@@ -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));
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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment