You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by yi...@apache.org on 2024/07/19 14:51:00 UTC

(doris) branch branch-2.1 updated: [branch-2.1][fix](compatibility) Enhance SSL and Long Flag Handling in MySQL Handshake (#38140)

This is an automated email from the ASF dual-hosted git repository.

yiguolei pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/branch-2.1 by this push:
     new b24774c3407 [branch-2.1][fix](compatibility) Enhance SSL and Long Flag Handling in MySQL Handshake  (#38140)
b24774c3407 is described below

commit b24774c3407c50aad136b55b9e9fd600c9783333
Author: zy-kkk <zh...@gmail.com>
AuthorDate: Fri Jul 19 22:50:51 2024 +0800

    [branch-2.1][fix](compatibility) Enhance SSL and Long Flag Handling in MySQL Handshake  (#38140)
    
    pick(#38086)
    Issue Number: close #38065
    
    This PR introduces a fix to the SSL and CLIENT_LONG_FLAG handling in the
    MySQL handshake process. It ensures that the flags are correctly set
    according to the protocol requirements and resolves the issues related
    to decimal data fetching when SSL is enabled.
---
 fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlCapability.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlCapability.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlCapability.java
index b3d4793eeb2..cbfa88038be 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlCapability.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/MysqlCapability.java
@@ -80,7 +80,7 @@ public class MysqlCapability {
     private static final int SSL_FLAGS = Flag.CLIENT_PROTOCOL_41.getFlagBit()
             | Flag.CLIENT_CONNECT_WITH_DB.getFlagBit() | Flag.CLIENT_SECURE_CONNECTION.getFlagBit()
             | Flag.CLIENT_PLUGIN_AUTH.getFlagBit() | Flag.CLIENT_LOCAL_FILES.getFlagBit()
-            | Flag.CLIENT_SSL.getFlagBit();
+            | Flag.CLIENT_LONG_FLAG.getFlagBit() | Flag.CLIENT_SSL.getFlagBit();
 
     public static final MysqlCapability DEFAULT_CAPABILITY = new MysqlCapability(DEFAULT_FLAGS);
     public static final MysqlCapability SSL_CAPABILITY = new MysqlCapability(SSL_FLAGS);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org