diff options
Diffstat (limited to 'storage/spider/spd_init_query.h')
-rw-r--r-- | storage/spider/spd_init_query.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/storage/spider/spd_init_query.h b/storage/spider/spd_init_query.h index 19b04d50b82..1cf987134f6 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)" @@ -548,7 +543,7 @@ static LEX_STRING spider_init_queries[] = { " @server_major_version > 10 or" " (" " @server_major_version = 10 and" - " @server_minor_version >= 7" + " @server_minor_version >= 999" " )" " )" " then" @@ -808,7 +803,7 @@ static LEX_STRING spider_init_queries[] = { " @server_major_version > 10 or" " (" " @server_major_version = 10 and" - " @server_minor_version >= 7" + " @server_minor_version >= 999" " )" " )" " then" |