summaryrefslogtreecommitdiff
path: root/storage/spider
diff options
context:
space:
mode:
authorKentoku <kentokushiba@gmail.com>2019-11-01 16:40:26 +0900
committerKentoku SHIBA <kentokushiba@gmail.com>2020-06-01 12:04:34 +0900
commit132d5822e2bd2a3c90eb926ca10e38a40d0b16f9 (patch)
treeffab99ae602d5f4054b6341b1cae27f1bbd11436 /storage/spider
parent1d393fed711727533c84e186aeed8b232b23657d (diff)
downloadmariadb-git-132d5822e2bd2a3c90eb926ca10e38a40d0b16f9.tar.gz
MENT-458 MTR Big test "spider/bugfix.sql_mode_mariadb & myself" are both failing on Azure MTR pipeline
Support the dash number of MariaDB versions by Spider's tests
Diffstat (limited to 'storage/spider')
-rw-r--r--storage/spider/mysql-test/spider/include/init_spider.inc5
1 files changed, 5 insertions, 0 deletions
diff --git a/storage/spider/mysql-test/spider/include/init_spider.inc b/storage/spider/mysql-test/spider/include/init_spider.inc
index 69d1fae425e..09529bb3c96 100644
--- a/storage/spider/mysql-test/spider/include/init_spider.inc
+++ b/storage/spider/mysql-test/spider/include/init_spider.inc
@@ -131,6 +131,11 @@ if (!$VERSION_COMPILE_OS_WIN)
let $SERVER_NAME=
`SELECT SUBSTRING_INDEX(SUBSTRING_INDEX(version(), '-', 2), '-', -1)`;
+if (`SELECT IF('$SERVER_NAME' REGEXP '^[0-9]+\$', 1, 0)`)
+{
+ let $SERVER_NAME=
+ `SELECT SUBSTRING_INDEX(SUBSTRING_INDEX(version(), '-', 3), '-', -1)`;
+}
let $SERVER_MAJOR_VERSION=
`SELECT SUBSTRING_INDEX(version(), '.', 1)`;
let $SERVER_MINOR_VERSION=