6767import org .apache .doris .mysql .MysqlChannel ;
6868import org .apache .doris .mysql .MysqlCommand ;
6969import org .apache .doris .mysql .MysqlEofPacket ;
70- import org .apache .doris .mysql .MysqlOkPacket ;
7170import org .apache .doris .mysql .MysqlSerializer ;
7271import org .apache .doris .mysql .ProxyMysqlChannel ;
7372import org .apache .doris .nereids .NereidsPlanner ;
@@ -1538,11 +1537,15 @@ private void sendMetaData(ResultSetMetaData metaData, List<FieldInfo> fieldInfos
15381537 }
15391538 context .getMysqlChannel ().sendOnePacket (serializer .toByteBuffer ());
15401539 }
1541- // send EOF
1542- serializer .reset ();
1543- MysqlEofPacket eofPacket = new MysqlEofPacket (context .getState ());
1544- eofPacket .writeTo (serializer );
1545- context .getMysqlChannel ().sendOnePacket (serializer .toByteBuffer ());
1540+ // When CLIENT_DEPRECATE_EOF is set, the server should not send the intermediate
1541+ // EOF packet after column definitions. The client will go directly from column
1542+ // definitions to reading data rows.
1543+ if (!context .getMysqlChannel ().clientDeprecatedEOF ()) {
1544+ serializer .reset ();
1545+ MysqlEofPacket eofPacket = new MysqlEofPacket (context .getState ());
1546+ eofPacket .writeTo (serializer );
1547+ context .getMysqlChannel ().sendOnePacket (serializer .toByteBuffer ());
1548+ }
15461549 }
15471550
15481551 private List <PrimitiveType > exprToStringType (List <Expr > exprs ) {
@@ -1584,15 +1587,15 @@ public void sendStmtPrepareOK(int stmtId, List<String> labels, List<Slot> output
15841587 serializer .writeField (colNames .get (i ), Type .STRING );
15851588 context .getMysqlChannel ().sendOnePacket (serializer .toByteBuffer ());
15861589 }
1587- serializer .reset ();
1590+ // When CLIENT_DEPRECATE_EOF is set, no EOF/OK packet should be sent after
1591+ // parameter definitions. The driver knows how many params to expect from the
1592+ // prepare OK packet and simply stops reading after that count.
15881593 if (!context .getMysqlChannel ().clientDeprecatedEOF ()) {
1594+ serializer .reset ();
15891595 MysqlEofPacket eofPacket = new MysqlEofPacket (context .getState ());
15901596 eofPacket .writeTo (serializer );
1591- } else {
1592- MysqlOkPacket okPacket = new MysqlOkPacket (context .getState ());
1593- okPacket .writeTo (serializer );
1597+ context .getMysqlChannel ().sendOnePacket (serializer .toByteBuffer ());
15941598 }
1595- context .getMysqlChannel ().sendOnePacket (serializer .toByteBuffer ());
15961599 }
15971600 if (numColumns > 0 ) {
15981601 for (Slot slot : output ) {
@@ -1611,15 +1614,15 @@ public void sendStmtPrepareOK(int stmtId, List<String> labels, List<Slot> output
16111614 }
16121615 context .getMysqlChannel ().sendOnePacket (serializer .toByteBuffer ());
16131616 }
1614- serializer .reset ();
1617+ // When CLIENT_DEPRECATE_EOF is set, no EOF/OK packet should be sent after
1618+ // column definitions. The driver knows how many columns to expect from the
1619+ // prepare OK packet and simply stops reading after that count.
16151620 if (!context .getMysqlChannel ().clientDeprecatedEOF ()) {
1621+ serializer .reset ();
16161622 MysqlEofPacket eofPacket = new MysqlEofPacket (context .getState ());
16171623 eofPacket .writeTo (serializer );
1618- } else {
1619- MysqlOkPacket okPacket = new MysqlOkPacket (context .getState ());
1620- okPacket .writeTo (serializer );
1624+ context .getMysqlChannel ().sendOnePacket (serializer .toByteBuffer ());
16211625 }
1622- context .getMysqlChannel ().sendOnePacket (serializer .toByteBuffer ());
16231626 }
16241627 context .getMysqlChannel ().flush ();
16251628 context .getState ().setNoop ();
@@ -1668,11 +1671,15 @@ private void sendFields(List<String> colNames, List<FieldInfo> fieldInfos, List<
16681671 context .getMysqlChannel ().sendOnePacket (serializer .toByteBuffer ());
16691672 }
16701673 }
1671- // send EOF
1672- serializer .reset ();
1673- MysqlEofPacket eofPacket = new MysqlEofPacket (context .getState ());
1674- eofPacket .writeTo (serializer );
1675- context .getMysqlChannel ().sendOnePacket (serializer .toByteBuffer ());
1674+ // When CLIENT_DEPRECATE_EOF is set, the server should not send the intermediate
1675+ // EOF packet after column definitions. The client will go directly from column
1676+ // definitions to reading data rows.
1677+ if (!context .getMysqlChannel ().clientDeprecatedEOF ()) {
1678+ serializer .reset ();
1679+ MysqlEofPacket eofPacket = new MysqlEofPacket (context .getState ());
1680+ eofPacket .writeTo (serializer );
1681+ context .getMysqlChannel ().sendOnePacket (serializer .toByteBuffer ());
1682+ }
16761683 }
16771684
16781685 public void sendResultSet (ResultSet resultSet ) throws IOException {
0 commit comments