MNDR:

- remove unused macros

diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c
index be15c9b3ed2da03472df4069291835ab2ab3449a..48864010b1407ac93569be719c2c41d81401e33a 100644 (file)
--- a/ext/mysqlnd/mysqlnd_ps.c
+++ b/ext/mysqlnd/mysqlnd_ps.c
@@ -30,9 +30,6 @@
 #include "mysqlnd_block_alloc.h"
 #include "mysqlnd_ext_plugin.h"
 
-#define MYSQLND_SILENT
-
-
 const char * const mysqlnd_not_bound_as_blob = "Can't send long data for non-string/non-binary data types";
 const char * const mysqlnd_stmt_not_prepared = "Statement not prepared";
 

diff --git a/ext/mysqlnd/mysqlnd_ps_codec.c b/ext/mysqlnd/mysqlnd_ps_codec.c
index a6ad9ff3e5be1d41e6261a03d95aeeafe231c704..733aad187e19649a5755e3294d4d865013fe06f8 100644 (file)
--- a/ext/mysqlnd/mysqlnd_ps_codec.c
+++ b/ext/mysqlnd/mysqlnd_ps_codec.c
@@ -28,8 +28,6 @@
 #include "mysqlnd_debug.h"
 #include "mysql_float_to_double.h"
 
-#define MYSQLND_SILENT
-
 
 enum mysqlnd_timestamp_type
 {

diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c
index 62509f58973f4a126c5a66bdd1b8f703f11703e5..7d9529ffb59b01e38f2739cffb1e38dff8534890 100644 (file)
--- a/ext/mysqlnd/mysqlnd_result.c
+++ b/ext/mysqlnd/mysqlnd_result.c
@@ -29,8 +29,6 @@
 #include "mysqlnd_debug.h"
 #include "mysqlnd_ext_plugin.h"
 
-#define MYSQLND_SILENT
-
 /* {{{ mysqlnd_result_buffered_zval::initialize_result_set_rest */
 static enum_func_status
 MYSQLND_METHOD(mysqlnd_result_buffered_zval, initialize_result_set_rest)(MYSQLND_RES_BUFFERED * const result, MYSQLND_RES_METADATA * const meta,

diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c
index 868e38305243be3961181f540f6059065defb5a1..08bb762ae5f5c40bc8b02a1329a83c9b6a8b01d9 100644 (file)
--- a/ext/mysqlnd/mysqlnd_wireprotocol.c
+++ b/ext/mysqlnd/mysqlnd_wireprotocol.c
@@ -26,9 +26,6 @@
 #include "mysqlnd_statistics.h"
 #include "mysqlnd_debug.h"
 
-#define MYSQLND_SILENT 1
-#define MYSQLND_DUMP_HEADER_N_BODY
-
 #define BAIL_IF_NO_MORE_DATA \
        if ((size_t)(p - begin) > packet->header.size) { \
                php_error_docref(NULL, E_WARNING, "Premature end of data (mysqlnd_wireprotocol.c:%u)", __LINE__); \
@@ -257,9 +254,7 @@ mysqlnd_read_header(MYSQLND_PFC * pfc, MYSQLND_VIO * vio, MYSQLND_PACKET_HEADER
        header->size = uint3korr(buffer);
        header->packet_no = uint1korr(buffer + 3);
 
-#ifdef MYSQLND_DUMP_HEADER_N_BODY
        DBG_INF_FMT("HEADER: prot_packet_no=%u size=%3u", header->packet_no, header->size);
-#endif
        MYSQLND_INC_CONN_STATISTIC_W_VALUE2(conn_stats,
                                                        STAT_PROTOCOL_OVERHEAD_IN, MYSQLND_HEADER_SIZE,
                                                        STAT_PACKETS_RECEIVED, 1);