Merge branch 'mysql-8.0' into mysql-trunk

Author: lkotula

mysql-test/suite/x/include/connection_ssl.inc

@@ -6,14 +6,15 @@
 #2) wolfssl SSL context counters (GLOBAL status variables) are always 0
 #3) other cipher list than openssl
 
+--let $INCREMENT=1
 --let $USE_SOCKET=
---let $ERROR_IF_CHANNEL_UNSECURE= Secure transport required. To log in you must use TCP\+SSL or UNIX socket connection. \(code 1045\)
+--let $ERROR_IF_CHANNEL_UNSECURE= Secure transport required. To log in you must use TCP.SSL or UNIX socket connection. \(code 1045\)
 
 --let $USER_AUTH_PLUGIN= 'mysql_native_password'
---source  ../include/connection_ssl.inc
+--source ../include/connection_ssl.inc
 
 --let $USER_AUTH_PLUGIN= 'sha256_password'
---source  ../include/connection_ssl.inc
+--source ../include/connection_ssl.inc
 
 --let $USER_AUTH_PLUGIN= 'caching_sha2_password'
 --source ../include/connection_ssl.inc

mysql-test/suite/x/r/connection_openssl.result

@@ -7,16 +7,16 @@
 #2) wolfssl SSL context counters (GLOBAL status variables) are always 0
 #3) other cipher list than openssl
 
+--let $INCREMENT=1
 --let $ERROR_IF_CHANNEL_UNSECURE= Secure transport required. To log in you must use TCP\+SSL or UNIX socket connection. \(code 1045\)
-
 --let $USE_SOCKET= '--socket=$MASTER_X_MYSOCK'
 --let $ERROR_IF_CHANNEL_UNSECURE=
 
 --let $USER_AUTH_PLUGIN= 'mysql_native_password'
---source  ../include/connection_ssl.inc
+--source ../include/connection_ssl.inc
 
 --let $USER_AUTH_PLUGIN= 'sha256_password'
---source  ../include/connection_ssl.inc
+--source ../include/connection_ssl.inc
 
 --let $USER_AUTH_PLUGIN= 'caching_sha2_password'
 --source ../include/connection_ssl.inc

mysql-test/suite/x/r/connection_openssl_unixsocket.result

@@ -1,4 +1,4 @@
 --loose-mysqlx-ssl-key=$MYSQL_TEST_DIR/std_data/server-key.pem
 --loose-mysqlx-ssl-cert=$MYSQL_TEST_DIR/std_data/server-cert.pem
 --loose-mysqlx-ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem
---loose-mysqlx-ssl-cipher=DHE-RSA-AES256-SHA:AES256-SHA
+--loose-mysqlx-ssl-cipher=DHE-RSA-AES256-SHA:AES256-SHA

mysql-test/suite/x/r/connection_wolfssl.result

@@ -6,6 +6,7 @@
 #2) wolfssl SSL context counters (GLOBAL status variables) are always 0
 #3) other cipher list than openssl
 
+--let $INCREMENT=0
 --let $USE_SOCKET=
 --let $ERROR_IF_CHANNEL_UNSECURE= Secure transport required. To log in you must use TCP\+SSL or UNIX socket connection. \(code 1045\)
 

mysql-test/suite/x/r/connection_wolfssl_unixsocket.result

@@ -1,4 +1,4 @@
 --loose-mysqlx-ssl-key=$MYSQL_TEST_DIR/std_data/server-key.pem
 --loose-mysqlx-ssl-cert=$MYSQL_TEST_DIR/std_data/server-cert.pem
 --loose-mysqlx-ssl-ca=$MYSQL_TEST_DIR/std_data/cacert.pem
---loose-mysqlx-ssl-cipher=DHE-RSA-AES256-SHA:AES256-SHA
+--loose-mysqlx-ssl-cipher=DHE-RSA-AES256-SHA:AES256-SHA