Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
bce3f3f6
Commit
bce3f3f6
authored
Aug 02, 2024
by
Yuchen Pei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-34682 Reset spider_hton_ptr in error mode of spider_db_init()
parent
8b51d344
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
39 additions
and
5 deletions
+39
-5
storage/spider/mysql-test/spider/bugfix/r/mdev_34682.result
storage/spider/mysql-test/spider/bugfix/r/mdev_34682.result
+19
-0
storage/spider/mysql-test/spider/bugfix/t/mdev_34682.test
storage/spider/mysql-test/spider/bugfix/t/mdev_34682.test
+14
-0
storage/spider/mysql-test/spider/include/clean_up_spider.inc
storage/spider/mysql-test/spider/include/clean_up_spider.inc
+5
-5
storage/spider/spd_table.cc
storage/spider/spd_table.cc
+1
-0
No files found.
storage/spider/mysql-test/spider/bugfix/r/mdev_34682.result
0 → 100644
View file @
bce3f3f6
set @old_aria_encrypt_tables=@@global.aria_encrypt_tables;
set global aria_encrypt_tables=ON;
CREATE FUNCTION spider_direct_sql RETURNS INT SONAME 'ha_spider.so';
call mtr.add_suppression(".*\\[ERROR\\] SPIDER plugin initialization failed at.* by 'Initialization of encryption failed for");
call mtr.add_suppression(".*\\[ERROR\\] Plugin 'SPIDER' registration as a STORAGE ENGINE failed.");
INSTALL PLUGIN spider SONAME 'ha_spider.so';
ERROR HY000: Can't initialize function 'spider'; Plugin initialization function failed.
SELECT spider_direct_sql ('SELECT * FROM s','a','srv "b"');
ERROR HY000: Can't initialize function 'spider_direct_sql'; Plugin 'SPIDER' is not loaded
Warnings:
Note 1305 FUNCTION test.spider_flush_table_mon_cache does not exist
Warnings:
Note 1305 FUNCTION test.spider_copy_tables does not exist
Warnings:
Note 1305 FUNCTION test.spider_ping_table does not exist
Warnings:
Note 1305 FUNCTION test.spider_bg_direct_sql does not exist
Warnings:
Note 1305 SONAME ha_spider.so does not exist
storage/spider/mysql-test/spider/bugfix/t/mdev_34682.test
0 → 100644
View file @
bce3f3f6
set
@
old_aria_encrypt_tables
=@@
global
.
aria_encrypt_tables
;
set
global
aria_encrypt_tables
=
ON
;
CREATE
FUNCTION
spider_direct_sql
RETURNS
INT
SONAME
'ha_spider.so'
;
call
mtr
.
add_suppression
(
".*
\\
[ERROR
\\
] SPIDER plugin initialization failed at.* by 'Initialization of encryption failed for"
);
call
mtr
.
add_suppression
(
".*
\\
[ERROR
\\
] Plugin 'SPIDER' registration as a STORAGE ENGINE failed."
);
--
error
ER_CANT_INITIALIZE_UDF
INSTALL
PLUGIN
spider
SONAME
'ha_spider.so'
;
--
error
ER_CANT_INITIALIZE_UDF
SELECT
spider_direct_sql
(
'SELECT * FROM s'
,
'a'
,
'srv "b"'
);
--
disable_query_log
--
source
../../
include
/
clean_up_spider
.
inc
set
global
aria_encrypt_tables
=@
old_aria_encrypt_tables
;
storage/spider/mysql-test/spider/include/clean_up_spider.inc
View file @
bce3f3f6
DROP
FUNCTION
spider_flush_table_mon_cache
;
DROP
FUNCTION
IF
EXISTS
spider_flush_table_mon_cache
;
DROP
FUNCTION
spider_copy_tables
;
DROP
FUNCTION
IF
EXISTS
spider_copy_tables
;
DROP
FUNCTION
spider_ping_table
;
DROP
FUNCTION
IF
EXISTS
spider_ping_table
;
DROP
FUNCTION
spider_bg_direct_sql
;
DROP
FUNCTION
IF
EXISTS
spider_bg_direct_sql
;
DROP
FUNCTION
spider_direct_sql
;
DROP
FUNCTION
IF
EXISTS
spider_direct_sql
;
UNINSTALL
SONAME
IF
EXISTS
'ha_spider'
;
UNINSTALL
SONAME
IF
EXISTS
'ha_spider'
;
DROP
TABLE
IF
EXISTS
mysql
.
spider_xa
;
DROP
TABLE
IF
EXISTS
mysql
.
spider_xa
;
DROP
TABLE
IF
EXISTS
mysql
.
spider_xa_member
;
DROP
TABLE
IF
EXISTS
mysql
.
spider_xa_member
;
...
...
storage/spider/spd_table.cc
View file @
bce3f3f6
...
@@ -6805,6 +6805,7 @@ int spider_db_init(
...
@@ -6805,6 +6805,7 @@ int spider_db_init(
pthread_attr_destroy
(
&
spider_pt_attr
);
pthread_attr_destroy
(
&
spider_pt_attr
);
error_pt_attr_init:
error_pt_attr_init:
#endif
#endif
spider_hton_ptr
=
NULL
;
DBUG_RETURN
(
error_num
);
DBUG_RETURN
(
error_num
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment