From 06fda17a690b341d99b934400a8f963cae85a8da Mon Sep 17 00:00:00 2001 From: Satoshi Konno Date: Tue, 8 Oct 2024 22:58:12 +0900 Subject: [PATCH 1/2] Update protocol_classic.cc --- sql/protocol_classic.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/protocol_classic.cc b/sql/protocol_classic.cc index 6c0e4d8097ac..30e11f046612 100644 --- a/sql/protocol_classic.cc +++ b/sql/protocol_classic.cc @@ -1520,7 +1520,7 @@ int Protocol_classic::read_packet() { @par Example ~~~~~~~~~ - 21 00 00 00 03 01 01 00 01 fe 00 01 61 01 31 73 !....... ....a.1s + 2B 00 00 00 03 01 01 00 01 fe 00 01 61 01 31 73 +....... ....a.1s 65 6c 65 63 74 20 40 40 76 65 72 73 69 6f 6e 5f elect @@version_c 63 6f 6d 6d 65 6e 74 20 6c 69 6d 69 74 20 31 omment limit 1 From c9685b08bc93be84c0787cf877de0656fff14d79 Mon Sep 17 00:00:00 2001 From: Satoshi Konno Date: Thu, 30 Jan 2025 15:19:55 +0900 Subject: [PATCH 2/2] Remove garbage bytes --- sql/protocol_classic.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sql/protocol_classic.cc b/sql/protocol_classic.cc index 5a9eb6d4b432..455c31c6ae07 100644 --- a/sql/protocol_classic.cc +++ b/sql/protocol_classic.cc @@ -1998,13 +1998,13 @@ int Protocol_classic::read_packet() { @par Example for a prepared query like SELECT CONCAT(?, ?) AS col1 and no ::CLIENT_OPTIONAL_RESULTSET_METADATA ~~~~~~~~~~~ - 0c 00 00 01 00 01 00 00 00 01 00 02 00 00 00 00| ................ + 0c 00 00 01 00 01 00 00 00 01 00 02 00 00 00 00 ................ 17 00 00 02 03 64 65 66 00 00 00 01 3f 00 0c 3f .....def....?..? - 00 00 00 00 00 fd 80 00 00 00 00|17 00 00 03 03 ................ + 00 00 00 00 00 fd 80 00 00 00 00 17 00 00 03 03 ................ 64 65 66 00 00 00 01 3f 00 0c 3f 00 00 00 00 00 def....?..?..... - fd 80 00 00 00 00|05 00 00 04 fe 00 00 02 00|1a ................ + fd 80 00 00 00 00 05 00 00 04 fe 00 00 02 00 1a ................ 00 00 05 03 64 65 66 00 00 00 04 63 6f 6c 31 00 ....def....col1. - 0c 3f 00 00 00 00 00 fd 80 00 1f 00 00|05 00 00 .?.............. + 0c 3f 00 00 00 00 00 fd 80 00 1f 00 00 05 00 00 .?.............. 06 fe 00 00 02 00 ... ~~~~~~~~~~~