From: George Peter Banyard <girgias@php.net>
Date: Thu, 6 Aug 2020 15:27:13 +0000 (+0200)
Subject: Drop '#if 0' in mysqlnd_debug() from the MySQLnd extension
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c74001997f996e9a3d0e557226b125132d6993ef;p=php

Drop '#if 0' in mysqlnd_debug() from the MySQLnd extension

Closes GH-5587
---

diff --git a/ext/mysqli/tests/mysqli_debug_control_string.phpt b/ext/mysqli/tests/mysqli_debug_control_string.phpt
index 00994abd03..474f0998f6 100644
--- a/ext/mysqli/tests/mysqli_debug_control_string.phpt
+++ b/ext/mysqli/tests/mysqli_debug_control_string.phpt
@@ -73,5 +73,62 @@ if (!$IS_MYSQLND)
         print "libmysql/DBUG package prints some debug info here."
 ?>
 --EXPECTF--
+Warning: mysqli_debug(): Unrecognized format ',' in %s on line %d
+
+Warning: mysqli_debug(): Consecutive semicolons at position 0 in %s on line %d
 [023][control string '%s'] Trace file has not been written.
+
+Warning: mysqli_debug(): Colon expected, 'b' found in %s on line %d
+
+Warning: mysqli_debug(): Colon expected, 'c' found in %s on line %d
+
+Warning: mysqli_debug(): Colon expected, 'B' found in %s on line %d
+
+Warning: mysqli_debug(): Colon expected, 'C' found in %s on line %d
+
+Warning: mysqli_debug(): Colon expected, ',' found in %s on line %d
+
+Warning: mysqli_debug(): Colon expected, '1' found in %s on line %d
+
+Warning: mysqli_debug(): Colon expected, '2' found in %s on line %d
+
+Warning: mysqli_debug(): Colon expected, '3' found in %s on line %d
+
+Warning: mysqli_debug(): Unrecognized format 'b' in %s on line %d
+
+Warning: mysqli_debug(): Colon expected, 'B' found in %s on line %d
+
+Warning: mysqli_debug(): Colon expected, 'C' found in %s on line %d
+
+Warning: mysqli_debug(): Colon expected, ',' found in %s on line %d
+
+Warning: mysqli_debug(): Colon expected, '1' found in %s on line %d
+
+Warning: mysqli_debug(): Colon expected, '2' found in %s on line %d
+
+Warning: mysqli_debug(): Colon expected, '3' found in %s on line %d
+
+Warning: mysqli_debug(): Unrecognized format 'b' in %s on line %d
+
+Warning: mysqli_debug(): Colon expected, ';' found in %s on line %d
+
+Warning: mysqli_debug(): Colon expected, ';' found in %s on line %d
+
+Warning: mysqli_debug(): Colon expected, 'B' found in %s on line %d
+
+Warning: mysqli_debug(): Colon expected, 'C' found in %s on line %d
+
+Warning: mysqli_debug(): Colon expected, ',' found in %s on line %d
+
+Warning: mysqli_debug(): Colon expected, '1' found in %s on line %d
+
+Warning: mysqli_debug(): Colon expected, '2' found in %s on line %d
+
+Warning: mysqli_debug(): Colon expected, '3' found in %s on line %d
+
+Warning: mysqli_debug(): Unrecognized format 'b' in %s on line %d
+
+Warning: mysqli_debug(): Colon expected, ';' found in %s on line %d
+
+Warning: mysqli_debug(): Unrecognized format 'z' in %s on line %d
 done%s
diff --git a/ext/mysqlnd/mysqlnd_debug.c b/ext/mysqlnd/mysqlnd_debug.c
index 54c243d63b..ec698a265d 100644
--- a/ext/mysqlnd/mysqlnd_debug.c
+++ b/ext/mysqlnd/mysqlnd_debug.c
@@ -543,11 +543,9 @@ MYSQLND_METHOD(mysqlnd_debug, set_mode)(MYSQLND_DEBUG * self, const char * const
 				state = PARSER_WAIT_COLON;
 				break;
 			case ':':
-#if 0
 				if (state != PARSER_WAIT_COLON) {
 					php_error_docref(NULL, E_WARNING, "Consecutive semicolons at position %u", i);
 				}
-#endif
 				state = PARSER_WAIT_MODIFIER;
 				break;
 			case 'f': /* limit output to these functions */
@@ -581,10 +579,8 @@ MYSQLND_METHOD(mysqlnd_debug, set_mode)(MYSQLND_DEBUG * self, const char * const
 					}
 					i = j;
 				} else {
-#if 0
 					php_error_docref(NULL, E_WARNING,
 									 "Expected list of functions for '%c' found none", mode[i]);
-#endif
 				}
 				state = PARSER_WAIT_COLON;
 				break;
@@ -661,9 +657,7 @@ MYSQLND_METHOD(mysqlnd_debug, set_mode)(MYSQLND_DEBUG * self, const char * const
 				break;
 			default:
 				if (state == PARSER_WAIT_MODIFIER) {
-#if 0
 					php_error_docref(NULL, E_WARNING, "Unrecognized format '%c'", mode[i]);
-#endif
 					if (i+1 < mode_len && mode[i+1] == ',') {
 						i+= 2;
 						while (i < mode_len) {
@@ -675,9 +669,7 @@ MYSQLND_METHOD(mysqlnd_debug, set_mode)(MYSQLND_DEBUG * self, const char * const
 					}
 					state = PARSER_WAIT_COLON;
 				} else if (state == PARSER_WAIT_COLON) {
-#if 0
 					php_error_docref(NULL, E_WARNING, "Colon expected, '%c' found", mode[i]);
-#endif
 				}
 				break;
 		}