Skip checking vio state during COM_QUIT

Summary:
Skip checking the ERR during COM_QUIT to work
around a library clean-up issue on debug builds.

Differential Revision: D58419387

fbshipit-source-id: 1c94051

Author: hermanlee

include/violite.h

@@ -197,6 +197,7 @@ int vio_io_wait(MYSQL_VIO vio, enum enum_vio_io_event event, timeout_t timeout);
 bool vio_is_connected(MYSQL_VIO vio);
 #ifndef NDEBUG
 ssize_t vio_pending(MYSQL_VIO vio);
+void vio_set_quit(MYSQL_VIO vio);
 #endif
 /* Set timeout for a network operation. */
 int vio_timeout(MYSQL_VIO vio, uint which, timeout_t timeout);
@@ -456,6 +457,10 @@ struct Vio {
   /* Indicates whether socket or SSL based communication is blocking or not. */
   bool is_blocking_flag = {true};
 
+#ifndef NDEBUG
+  bool is_quit = {false};
+#endif /* NDEBUG */
+
  private:
   friend Vio *internal_vio_create(uint flags);
   friend void internal_vio_delete(Vio *vio);

sql-common/client.cc

@@ -1437,6 +1437,10 @@ bool cli_advanced_command(MYSQL *mysql, enum enum_server_command command,
     assert(mysql->net.vio != nullptr);
   }
 
+#ifndef NDEBUG
+  if (command == COM_QUIT) vio_set_quit(mysql->net.vio);
+#endif /* NDEBUG */
+
   /* turn off non blocking operations */
   if (!vio_is_blocking(mysql->net.vio))
     vio_set_blocking_flag(mysql->net.vio, true);
@@ -1615,6 +1619,11 @@ net_async_status cli_advanced_command_nonblocking(
     set_mysql_error(mysql, CR_SERVER_GONE_ERROR, unknown_sqlstate);
     goto end;
   }
+
+#ifndef NDEBUG
+  if (command == COM_QUIT) vio_set_quit(mysql->net.vio);
+#endif /* NDEBUG */
+
   /**
     When non blocking API execution is pending and did not complete then
     it can result in async context to be null. In such case if user executes

vio/viosocket.cc

@@ -1234,6 +1234,11 @@ ssize_t vio_pending(Vio *vio) {
   return (ssize_t)bytes;
 }
 
+/**
+  Set when sending the quit packet and skip certain state checks
+*/
+void vio_set_quit(Vio *vio) { vio->is_quit = true; }
+
 #endif
 
 /**

vio/viossl.cc

@@ -323,7 +323,7 @@ size_t vio_ssl_write(Vio *vio, const uchar *buf, size_t size) {
       SSL_write() returns an error from the error queue, when SSL_write() failed
       because it would block.
     */
-    assert(ERR_peek_error() == 0);
+    assert(ERR_peek_error() == 0 || vio->is_quit);
 
     ret = SSL_write(ssl, buf, (int)size);