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
5595ed9d
Commit
5595ed9d
authored
Jan 19, 2022
by
Nayuta Yanagisawa
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-27521 SIGSEGV in spider_parse_connect_info in MDEV-27106 branch
Add NULL check to SPIDER_OPTION_STR_LIST.
parent
0599dd90
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
1 deletion
+16
-1
storage/spider/mysql-test/spider/feature/r/engine_defined_attributes.result
...ql-test/spider/feature/r/engine_defined_attributes.result
+7
-0
storage/spider/mysql-test/spider/feature/t/engine_defined_attributes.test
...ysql-test/spider/feature/t/engine_defined_attributes.test
+8
-0
storage/spider/spd_table.cc
storage/spider/spd_table.cc
+1
-1
No files found.
storage/spider/mysql-test/spider/feature/r/engine_defined_attributes.result
View file @
5595ed9d
...
...
@@ -209,6 +209,13 @@ REMOTE_SERVER="s_2_2" REMOTE_DATABASE="auto_test_remote2"
SELECT * FROM tbl_a;
a b
DROP TABLE tbl_a;
CREATE TABLE tbl_a (
a INT
) ENGINE=Spider DEFAULT CHARSET=utf8
PARTITION BY HASH (a) PARTITIONS 2;
SELECT * FROM tbl_a;
ERROR HY000: Unable to connect to foreign data source: localhost
DROP TABLE tbl_a;
connection child2_1;
DROP DATABASE auto_test_remote;
connection child2_2;
...
...
storage/spider/mysql-test/spider/feature/t/engine_defined_attributes.test
View file @
5595ed9d
...
...
@@ -194,6 +194,14 @@ PARTITION BY RANGE (a) (
SELECT
*
FROM
tbl_a
;
DROP
TABLE
tbl_a
;
eval
CREATE
TABLE
tbl_a
(
a
INT
)
$MASTER_1_ENGINE
$MASTER_1_CHARSET
PARTITION
BY
HASH
(
a
)
PARTITIONS
2
;
--
error
ER_CONNECT_TO_FOREIGN_DATA_SOURCE
SELECT
*
FROM
tbl_a
;
DROP
TABLE
tbl_a
;
--
connection
child2_1
DROP
DATABASE
auto_test_remote
;
...
...
storage/spider/spd_table.cc
View file @
5595ed9d
...
...
@@ -2015,7 +2015,7 @@ int st_spider_param_string_parse::print_param_error()
corresponding attribute of SPIDER_SHARE.
*/
#define SPIDER_OPTION_STR_LIST(title_name, option_name, param_name) \
if (option_struct
->option_name)
\
if (option_struct
&& option_struct->option_name)
\
{ \
DBUG_PRINT("info", ("spider " title_name " start overwrite")); \
share->SPIDER_PARAM_STR_CHARLEN(param_name)= \
...
...
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