WL#10676: DevAPI: asynchronous execution - part1 - fixes

1. Remove error in Stmt_op logic which did not correctly handle a statement that is being discarded.

2. Invalidate a session if errors were detected during its shut down sequence.

Author: rsomla1

cdk/mysqlx/result.cc

@@ -131,6 +131,16 @@ bool Stmt_op::do_cont()
 
       m_op_mdata = false;
 
+      if (m_discard)
+      {
+        switch (m_state)
+        {
+        case ROWS: m_state = DISCARD; break;
+        case NEXT: m_state = MDATA; break;
+        default: break;
+        }
+      }
+
       switch (m_state)
       {
       case OK:
@@ -191,6 +201,9 @@ bool Stmt_op::is_completed() const
     return true;
   case ROWS:
   case NEXT:
+    if (m_discard)
+      return false;
+    FALLTHROUGH;
   case DONE:
     /*
       In one of these states we still continue until do_cont() finishes the

cdk/mysqlx/session.cc

@@ -598,6 +598,8 @@ Session::~Session()
   }
   catch (...)
   {
+    // Something went wrong - do not try to use this session again.
+    m_isvalid = false;
   }
 }
 
@@ -712,11 +714,16 @@ void Session::clean_up()
 void Session::close()
 {
   if (is_valid())
-  {
+  try {
     clean_up();
     m_protocol.snd_ConnectionClose().wait();
     m_protocol.rcv_Reply(*this).wait();
   }
+  catch (...)
+  {
+    m_isvalid = false;
+    throw;
+  }
   m_isvalid = false;
 }
 

devapi/tests/session-t.cc

@@ -1386,15 +1386,16 @@ TEST_F(Sess, bugs)
     EXPECT_THROW(mysqlx::Session sess(sess_settings), mysqlx::Error);
   }
 
+  cout << "empty string as password" << endl;
+
   {
-    // empty string as password
     SessionSettings sess_settings("localhost_not_found", 13009, "rafal", "");
   }
 
 
-  {
-    // Using same Result on different sessions
+  cout << "Using same Result on different sessions" << endl;
 
+  {
     SessionSettings settings(SessionOption::PORT, get_port(),
                              SessionOption::USER,get_user(),
                              SessionOption::PWD, get_password() ?
@@ -1429,7 +1430,8 @@ TEST_F(Sess, bugs)
   catch(...)
   {}
 
-  //memory leak when using bad ssl_ca
+  cout << "memory leak when using bad ssl_ca" << endl;
+
   EXPECT_THROW(mysqlx::Session(SessionOption::SSL_CA, "Bad",
                                SessionOption::SSL_MODE, SSLMode::VERIFY_CA,
                                SessionOption::PORT, get_port(),
@@ -1440,6 +1442,17 @@ TEST_F(Sess, bugs)
                                  ),
                Error);
 
+  cout << "Session shut-down with pending multi-result set." << endl;
+
+  {
+    Session sess(this);
+
+    sess.sql("drop procedure if exists test.test").execute();
+    sess.sql("CREATE PROCEDURE test.test() BEGIN select 1; select 2; END")
+        .execute();
+
+    SqlResult res = sess.sql("call test.test()").execute();
+  }
 }