Merge pull request jonhoo#11 from datafuse-extras/CLIENT_PROTOCOL_41_MORE

Send ok packet after com field list

Author: BohuTANG

src/lib.rs

@@ -325,7 +325,6 @@ impl<B: MysqlShim<W>, R: Read, W: Write> MysqlIntermediary<B, R, W> {
                 | CapabilityFlags::CLIENT_PLUGIN_AUTH
                 | CapabilityFlags::CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA
                 | CapabilityFlags::CLIENT_CONNECT_WITH_DB
-                | CapabilityFlags::CLIENT_RESERVED
                 | CapabilityFlags::CLIENT_DEPRECATE_EOF
             // | CapabilityFlags::CLIENT_SSL
         )
@@ -594,6 +593,16 @@ impl<B: MysqlShim<W>, R: Read, W: Write> MysqlIntermediary<B, R, W> {
                         cols,
                         &mut self.writer,
                         self.client_capabilities,
+                        true,
+                    )?;
+                    let ok_packet = OkResponse {
+                        header: 0xfe,
+                        ..Default::default()
+                    };
+                    writers::write_ok_packet(
+                        &mut self.writer,
+                        self.client_capabilities,
+                        ok_packet,
                     )?;
                 }
                 Command::Init(schema) => {

src/resultset.rs

@@ -372,17 +372,21 @@ impl<'a, W: Write + 'a> RowWriter<'a, W> {
         if complete {
             if self.columns.is_empty() {
                 // response to no column query is always an OK packet
-                let mut resp = OkResponse::default();
-                resp.info = extra_info.to_string();
+                let resp = OkResponse {
+                    info: extra_info.to_string(),
+                    ..Default::default()
+                };
                 self.result.as_mut().unwrap().last_end = Some(Finalizer::Ok(resp));
             } else if self
                 .client_capabilities
                 .contains(CapabilityFlags::CLIENT_DEPRECATE_EOF)
             {
                 // response to no column query is always an OK packet
-                let mut resp = OkResponse::default();
-                resp.info = extra_info.to_string();
-                resp.header = 0xfe;
+                let resp = OkResponse {
+                    info: extra_info.to_string(),
+                    header: 0xfe,
+                    ..Default::default()
+                };
                 self.result.as_mut().unwrap().last_end = Some(Finalizer::Ok(resp));
             } else {
                 // we wrote out at least one row

src/writers.rs

@@ -80,8 +80,13 @@ where
     w.write_u16::<LittleEndian>(0)?; // number of warnings
     w.end_packet()?;
 
-    write_column_definitions_41(pi, w, client_capabilities)?;
-    write_column_definitions_41(ci, w, client_capabilities)
+    if pi.len() > 0 {
+        write_column_definitions_41(pi, w, client_capabilities, false)?;
+    }
+    if ci.len() > 0 {
+        write_column_definitions_41(ci, w, client_capabilities, false)?;
+    }
+    Ok(())
 }
 
 /// works for Protocol::ColumnDefinition41 is set
@@ -90,12 +95,12 @@ pub(crate) fn write_column_definitions_41<'a, I, W>(
     i: I,
     w: &mut PacketWriter<W>,
     client_capabilities: CapabilityFlags,
+    is_com_field_list: bool,
 ) -> io::Result<()>
 where
     I: IntoIterator<Item = &'a Column>,
     W: Write,
 {
-    let mut empty = true;
     for c in i {
         let c = c.borrow();
         use crate::myc::constants::UTF8_GENERAL_CI;
@@ -113,11 +118,13 @@ where
         w.write_all(&[0x00])?; // decimals
         w.write_all(&[0x00, 0x00])?; // unused
 
+        if is_com_field_list {
+            w.write_all(&[0xfb])?;
+        }
         w.end_packet()?;
-        empty = false;
     }
 
-    if !empty && !client_capabilities.contains(CapabilityFlags::CLIENT_DEPRECATE_EOF) {
+    if !client_capabilities.contains(CapabilityFlags::CLIENT_DEPRECATE_EOF) {
         write_eof_packet(w, StatusFlags::empty())
     } else {
         Ok(())
@@ -137,5 +144,5 @@ where
     let i = i.into_iter();
     w.write_lenenc_int(i.len() as u64)?;
     w.end_packet()?;
-    write_column_definitions_41(i, w, client_capabilities)
+    write_column_definitions_41(i, w, client_capabilities, false)
 }