diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2021-09-06 19:56:45 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2021-09-07 21:15:51 +0200 |
| commit | 76149650764ea9660ae05d4987ea6c91534851ab (patch) | |
| tree | 734329771e49981ba8cc1f7d6fc002f2139c3030 | |
| parent | d0a1ea3aca6ff68d6ab6b48fdf8ab1ec3d906dcb (diff) | |
| download | mariadb-git-76149650764ea9660ae05d4987ea6c91534851ab.tar.gz | |
fix spider SERVER_NAME detection
A version does not necessarily follow the ##.##.##-MariaDB-* pattern
But it's always MariaDB, what else?
| -rw-r--r-- | storage/spider/mysql-test/spider/include/init_spider.inc | 8 | ||||
| -rw-r--r-- | storage/spider/spd_init_query.h | 7 |
2 files changed, 2 insertions, 13 deletions
diff --git a/storage/spider/mysql-test/spider/include/init_spider.inc b/storage/spider/mysql-test/spider/include/init_spider.inc index 6a22ffcc1fd..b3fb4df239b 100644 --- a/storage/spider/mysql-test/spider/include/init_spider.inc +++ b/storage/spider/mysql-test/spider/include/init_spider.inc @@ -149,13 +149,7 @@ 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_NAME=MariaDB; let $SERVER_MAJOR_VERSION= `SELECT SUBSTRING_INDEX(version(), '.', 1)`; let $SERVER_MINOR_VERSION= diff --git a/storage/spider/spd_init_query.h b/storage/spider/spd_init_query.h index ba982590766..0dcbcd50230 100644 --- a/storage/spider/spd_init_query.h +++ b/storage/spider/spd_init_query.h @@ -224,12 +224,7 @@ static LEX_STRING spider_init_queries[] = { {C_STRING_WITH_LEN( "create procedure mysql.spider_fix_system_tables()" "begin" - " select substring_index(substring_index(version(), '-', 2), '-', -1)" - " into @server_name;" - " if @server_name regexp '^[0-9]+$' then" - " select substring_index(substring_index(version(), '-', 3), '-', -1)" - " into @server_name;" - " end if;" + " select 'MariaDB' into @server_name;" " select substring_index(version(), '.', 1)" " into @server_major_version;" " select substring_index(substring_index(version(), '.', 2), '.', -1)" |