commit f16b597feb128370495d99f7dc7ff16fccb25014
Author: Laurynas Biveinis <laurynas.biveinis@gmail.com>
Date:   Mon Jun 19 06:14:41 2017 +0300

    Bug 75311 / 1660339 (Error for SSL cipher is unhelpful) follow-up for X plugin
    
    In x.connection_tls_version testcase, expect different OpenSSL and
    YaSSL diagnostics due to bug 75311 / 1660339 fix.

diff --git a/rapid/plugin/x/tests/mtr/include/connection_tls_version.inc b/rapid/plugin/x/tests/mtr/include/connection_tls_version.inc
index e2b93542829..6cabce1db59 100644
--- a/rapid/plugin/x/tests/mtr/include/connection_tls_version.inc
+++ b/rapid/plugin/x/tests/mtr/include/connection_tls_version.inc
@@ -23,8 +23,12 @@ EOF
 --exec $MYSQLXTEST -uroot --file=$xtest_file 2>&1
 
 --let $XTESTPARAMS= -u user5_mysqlx --password='auth_string' --file=$xtest_file --ssl-cipher='DHE-RSA-AES256-SHA'
---let $ERROR1= /in main, line 0:ERROR: error:00000001:lib\(0\):func\(0\):reason\(1\)/Application terminated with expected error: protocol version mismatch/
---let $ERROR5= /in main, line 0:ERROR: error:00000005:lib\(0\):func\(0\):DH lib/Application terminated with expected error: socket layer receive error/
+
+# In ERROR1 and ERROR5, the first regex handles OpenSSL, the second one YaSSL
+
+--let $ERROR1= /in main, line 0:ERROR: error:14077102:SSL routines:SSL23_GET_SERVER_HELLO:/Application terminated with expected error: / /in main, line 0:ERROR: not in error state /Application terminated with expected error: unsupported protocol /
+
+--let $ERROR5= /in main, line 0:ERROR: error:00000000:lib\(0\):func\(0\):reason\(0\)/Application terminated with expected error: socket layer receive error/ /in main, line 0:ERROR: not in error state /Application terminated with expected error: socket layer receive error /
 
 --exec $MYSQLXTEST                                     $XTESTPARAMS 2>&1
 --exec $MYSQLXTEST --tls-version=TLSv1,TLSv1.1,TLSv1.2 $XTESTPARAMS 2>&1
@@ -48,14 +52,14 @@ EOF
 --exec $MYSQLXTEST --tls-version=TLSv1,TLSv1.2         $XTESTPARAMS 2>&1
 
 --let $expected_error_extra= $ERROR1
---let $expected_error_msg= protocol version mismatch \(code 2026\)
+--let $expected_error_msg= unsupported protocol \(code 2026\)
 --source ../include/mysqlxtest_expected_error.inc
 --exec $MYSQLXTEST --tls-version=TLSv1.1,TLSv1.2       $XTESTPARAMS 2>&1
 
 --exec $MYSQLXTEST --tls-version=TLSv1                 $XTESTPARAMS 2>&1
 
 --let $expected_error_extra= $ERROR1
---let $expected_error_msg= protocol version mismatch \(code 2026\)
+--let $expected_error_msg= unsupported protocol \(code 2026\)
 --source ../include/mysqlxtest_expected_error.inc
 --exec $MYSQLXTEST --tls-version=TLSv1.1               $XTESTPARAMS 2>&1
 
diff --git a/rapid/plugin/x/tests/mtr/r/connection_tls_version.result b/rapid/plugin/x/tests/mtr/r/connection_tls_version.result
index ed0864dc839..adbcc4edfce 100644
--- a/rapid/plugin/x/tests/mtr/r/connection_tls_version.result
+++ b/rapid/plugin/x/tests/mtr/r/connection_tls_version.result
@@ -167,7 +167,7 @@ Mysqlx.Ok {
   msg: "bye!"
 }
 ok
-Application terminated with expected error: protocol version mismatch (code 2026)
+Application terminated with expected error: unsupported protocol (code 2026)
 not ok
 CONNECTION_TYPE
 SSL/TLS
@@ -182,7 +182,7 @@ Mysqlx.Ok {
   msg: "bye!"
 }
 ok
-Application terminated with expected error: protocol version mismatch (code 2026)
+Application terminated with expected error: unsupported protocol (code 2026)
 not ok
 Application terminated with expected error: TLS version is invalid (code 2026)
 not ok
@@ -424,7 +424,7 @@ Mysqlx.Ok {
   msg: "bye!"
 }
 ok
-Application terminated with expected error: protocol version mismatch (code 2026)
+Application terminated with expected error: unsupported protocol (code 2026)
 not ok
 CONNECTION_TYPE
 SSL/TLS
@@ -439,7 +439,7 @@ Mysqlx.Ok {
   msg: "bye!"
 }
 ok
-Application terminated with expected error: protocol version mismatch (code 2026)
+Application terminated with expected error: unsupported protocol (code 2026)
 not ok
 Application terminated with expected error: TLS version is invalid (code 2026)
 not ok