summaryrefslogtreecommitdiff
path: root/mysql-test/suite/galera/include
diff options
context:
space:
mode:
authorJulius Goryavsky <julius.goryavsky@mariadb.com>2021-02-10 14:04:25 +0100
committerJulius Goryavsky <julius.goryavsky@mariadb.com>2021-02-11 13:44:01 +0100
commit95003eab451cac2fd2c0552f374a85842f2773f2 (patch)
tree32a269ed2e36ca53f99f23d0ddd1b251c3f65832 /mysql-test/suite/galera/include
parent362dcf9e017a7d16082237950bc8e241cb34f1c3 (diff)
downloadmariadb-git-95003eab451cac2fd2c0552f374a85842f2773f2.tar.gz
MDEV-19950: Galera test failure on galera_ssl_upgrade
The test requires adaptation for MariaDB, which is done in this patch. In addition, this patch includes a fix for the SST script startup code that adds escaping for special characters on the command line (in case they are contained in the arguments to mysqld). The fix does not require separate tests, as the required tests are already part of the mtr suite for Galera.
Diffstat (limited to 'mysql-test/suite/galera/include')
-rw-r--r--mysql-test/suite/galera/include/galera_base_port.inc8
1 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/suite/galera/include/galera_base_port.inc b/mysql-test/suite/galera/include/galera_base_port.inc
new file mode 100644
index 00000000000..caf986ee950
--- /dev/null
+++ b/mysql-test/suite/galera/include/galera_base_port.inc
@@ -0,0 +1,8 @@
+#
+# Extract base_port from galera node.
+#
+
+# Convert "... base_port = N; ..." to "N; ..."
+--let $s1 = `SELECT SUBSTR(@@wsrep_provider_options, LOCATE('base_port =', @@wsrep_provider_options) + LENGTH('base_port = '))`
+# Convert "N; ..." to "N"
+--let $_NODE_GALERAPORT = `SELECT SUBSTR('$s1', 1, LOCATE(';', '$s1') - 1)`