Merge remote-tracking branch 'origin/2.0-wl9970' into 2.0

Author: silvakid

devapi/tests/session-t.cc

@@ -361,11 +361,6 @@ TEST_F(Sess, ssl_session)
   //Test if ssl is enabled using cipher
   auto check_ssl_impl = [](mysqlx::XSession &sess, bool enable, int line)
   {
-    mysqlx::XSession sess(SessionSettings::PORT, get_port(),
-                          SessionSettings::USER,get_user(),
-                          SessionSettings::PWD, get_password() ? get_password() : NULL ,
-                          SessionSettings::SSL_ENABLE, true);
-
     SqlResult res =  sess.bindToDefaultShard().sql("SHOW STATUS LIKE 'mysqlx_ssl_cipher'").execute();
 
     auto row = res.fetchOne();
@@ -529,12 +524,4 @@ TEST_F(Sess, ssl_session)
 
   }
 
-
-  //Enable SSL
-  uri << "/?ssl-enable";
-  {
-    mysqlx::XSession sess(uri.str());
-
-    check_ssl(sess, true);  }
-
 }

xapi/tests/xapi-t.cc

@@ -778,16 +778,19 @@ TEST_F(xapi, conn_string_test)
   }
   cout << "Connected to xplugin..." << endl;
 
-  RESULT_CHECK(stmt = mysqlx_sql_new(local_sess, "SELECT 'foo'", MYSQLX_NULL_TERMINATED));
+  RESULT_CHECK(stmt = mysqlx_sql_new(local_sess, "SHOW STATUS LIKE 'mysqlx_ssl_cipher'", MYSQLX_NULL_TERMINATED));
   CRUD_CHECK(res = mysqlx_execute(stmt), stmt);
 
-  while ((row = mysqlx_row_fetch_one(res)) != NULL)
+  if ((row = mysqlx_row_fetch_one(res)) != NULL)
   {
-    char data[32];
+    char data[128] = { 0 };
     size_t data_len = sizeof(data);
-    EXPECT_EQ(RESULT_OK, mysqlx_get_bytes(row, 0, 0, data, &data_len));
-    EXPECT_STREQ("foo", data);
-    cout << "ROW DATA: " << data << " " << endl;
+    EXPECT_EQ(RESULT_OK, mysqlx_get_bytes(row, 1, 0, data, &data_len));
+    if (ssl_enable)
+    {
+      cout << "SSL Cipher: " << data << endl;
+      EXPECT_TRUE(data_len > 1);
+    }
   }
 
   mysqlx_session_close(local_sess);