Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 57 additions & 0 deletions ext/mysqli/tests/mysqli_debug_control_string.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 0 additions & 8 deletions ext/mysqlnd/mysqlnd_debug.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand All @@ -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;
}
Expand Down