From 4d26e3b0a4b974085c0f04f81b89a0cb8900f3d2 Mon Sep 17 00:00:00 2001 From: qnnn <65326092+qnnn@users.noreply.github.com> Date: Mon, 20 May 2024 11:11:30 +0800 Subject: [PATCH] [fix] QueryTimeout does not take effect in certain scenarios. --- .../java/com/mysql/cj/protocol/a/NativeProtocol.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeProtocol.java b/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeProtocol.java index ad4df4193..614499cd5 100644 --- a/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeProtocol.java +++ b/src/main/protocol-impl/java/com/mysql/cj/protocol/a/NativeProtocol.java @@ -943,7 +943,8 @@ public final T sendQueryPacket(Query callingQuery, NativeP } // Send query command and sql query string - NativePacketPayload resultPacket = sendCommand(queryPacket, false, 0); + NativePacketPayload resultPacket = sendCommand(queryPacket, false, + callingQuery.getTimeoutInMillis() <= 0 ? 0 : callingQuery.getTimeoutInMillis()); final long queryEndTime = getCurrentTimeNanosOrMillis(); final long queryDuration = queryEndTime - queryStartTime;