1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-32485 Fix Spider upgrade failure caused by duplication in mysql.func

Browse Source
This commit is contained in:
Yuchen Pei 2023-10-17 15:02:12 +11:00
parent 15a1168b36
commit 0b2fd01ed0
No known key found for this signature in database
GPG Key ID: 3DD1B35105743563
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
storage/spider/spd_init_query.h
View File

@ -657,7 +657,7 @@ static LEX_STRING spider_init_queries[] = {
"if @win_plugin = 0 then" "if @win_plugin = 0 then"
" begin not atomic" " begin not atomic"
" declare exit handler for 1041, 1123" " declare exit handler for 1041, 1123"
" insert into mysql.func values" " replace into mysql.func values"
" ('spider_direct_sql', 2, 'ha_spider.so', 'function')," " ('spider_direct_sql', 2, 'ha_spider.so', 'function'),"
" ('spider_bg_direct_sql', 2, 'ha_spider.so', 'aggregate')," " ('spider_bg_direct_sql', 2, 'ha_spider.so', 'aggregate'),"
" ('spider_ping_table', 2, 'ha_spider.so', 'function')," " ('spider_ping_table', 2, 'ha_spider.so', 'function'),"
@ -677,7 +677,7 @@ static LEX_STRING spider_init_queries[] = {
"else" "else"
" begin not atomic" " begin not atomic"
" declare exit handler for 1041, 1123" " declare exit handler for 1041, 1123"
" insert into mysql.func values" " replace into mysql.func values"
" ('spider_direct_sql', 2, 'ha_spider.dll', 'function')," " ('spider_direct_sql', 2, 'ha_spider.dll', 'function'),"
" ('spider_bg_direct_sql', 2, 'ha_spider.dll', 'aggregate')," " ('spider_bg_direct_sql', 2, 'ha_spider.dll', 'aggregate'),"
" ('spider_ping_table', 2, 'ha_spider.dll', 'function')," " ('spider_ping_table', 2, 'ha_spider.dll', 'function'),"