From b40c77c48da64d76a34a503f3adbe28cd2766d4d Mon Sep 17 00:00:00 2001 From: Rene Cannao Date: Tue, 31 Mar 2026 06:39:34 +0000 Subject: [PATCH] Revert "fix(#5306): SHOW WARNINGS with inline comments incorrectly sets warning_count" This reverts commit 049ea8ce843d2273236aa1e145e62fe66ba357d9. --- lib/mysql_connection.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/lib/mysql_connection.cpp b/lib/mysql_connection.cpp index f9a5d14e0..02d50a07d 100644 --- a/lib/mysql_connection.cpp +++ b/lib/mysql_connection.cpp @@ -1834,16 +1834,7 @@ handler_again: update_warning_count_from_connection(); // we reach here if there was no error // exclude warning_count from the OK/EOF packet for the ‘SHOW WARNINGS’ statement - // Use digest_text (comments stripped) when available; fall back to raw query - bool is_show_warnings = false; - if (myds && myds->sess && myds->sess->CurrentQuery.QueryParserArgs.digest_text) { - const char* dig_text = myds->sess->CurrentQuery.QueryParserArgs.digest_text; - const size_t dig_len = strlen(dig_text); - is_show_warnings = (dig_len == 13 && strncasecmp(dig_text, "SHOW WARNINGS", 13) == 0); - } else { - is_show_warnings = (query.length == 13 && strncasecmp(query.ptr, "SHOW WARNINGS", 13) == 0); - } - MyRS->add_eof(is_show_warnings); + MyRS->add_eof(query.length == 13 && strncasecmp(query.ptr, "SHOW WARNINGS", 13) == 0); NEXT_IMMEDIATE(ASYNC_QUERY_END); } }