diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-02-06 14:50:50 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-02-06 14:50:50 +0100 |
| commit | 4771ae4b22d2bdef0aafc563570c71d4636a2493 (patch) | |
| tree | d115bd7c68b1e6feab68ff6fcd547e0c86c79296 /sql/net_serv.cc | |
| parent | 60f51af755ea9d07c20a596ba21de184816fa265 (diff) | |
| parent | 0c25e58db6b045df92c209d396031cac5b528bbf (diff) | |
| download | mariadb-git-4771ae4b22d2bdef0aafc563570c71d4636a2493.tar.gz | |
Merge branch 'github/10.1' into 10.2
Diffstat (limited to 'sql/net_serv.cc')
| -rw-r--r-- | sql/net_serv.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index d9d35c5ed3f..7b988fd369b 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2016, Oracle and/or its affiliates. - Copyright (c) 2012, 2017, MariaDB Corporation + Copyright (c) 2012, 2018, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -58,6 +58,7 @@ #ifdef EXTRA_DEBUG #define EXTRA_DEBUG_fprintf fprintf #define EXTRA_DEBUG_fflush fflush +#define EXTRA_DEBUG_ASSERT DBUG_ASSERT #else static void inline EXTRA_DEBUG_fprintf(...) {} #ifndef MYSQL_SERVER @@ -70,6 +71,9 @@ static int inline EXTRA_DEBUG_fflush(...) { return 0; } static void inline MYSQL_SERVER_my_error(...) {} #endif +#ifndef EXTRA_DEBUG_ASSERT +# define EXTRA_DEBUG_ASSERT(X) do {} while(0) +#endif /* The following handles the differences when this is linked between the @@ -1085,7 +1089,7 @@ packets_out_of_order: ("Packets out of order (Found: %d, expected %u)", (int) net->buff[net->where_b + 3], net->pkt_nr)); - DBUG_ASSERT(0); + EXTRA_DEBUG_ASSERT(0); /* We don't make noise server side, since the client is expected to break the protocol for e.g. --send LOAD DATA .. LOCAL where |