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
2a64e72a
Commit
2a64e72a
authored
Oct 05, 2023
by
Yuchen Pei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-32046 [DEMO] Do not ignore error in spider_get_share()
parent
a60cf9c7
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
12 additions
and
20 deletions
+12
-20
storage/spider/mysql-test/spider/bugfix/r/mdev_26582.result
storage/spider/mysql-test/spider/bugfix/r/mdev_26582.result
+1
-1
storage/spider/mysql-test/spider/bugfix/r/mdev_27239.result
storage/spider/mysql-test/spider/bugfix/r/mdev_27239.result
+1
-5
storage/spider/mysql-test/spider/bugfix/r/mdev_27240.result
storage/spider/mysql-test/spider/bugfix/r/mdev_27240.result
+1
-1
storage/spider/mysql-test/spider/bugfix/r/self_reference_multi.result
...er/mysql-test/spider/bugfix/r/self_reference_multi.result
+2
-2
storage/spider/mysql-test/spider/bugfix/t/mdev_26582.test
storage/spider/mysql-test/spider/bugfix/t/mdev_26582.test
+1
-1
storage/spider/mysql-test/spider/bugfix/t/mdev_27239.test
storage/spider/mysql-test/spider/bugfix/t/mdev_27239.test
+1
-0
storage/spider/mysql-test/spider/bugfix/t/mdev_27240.test
storage/spider/mysql-test/spider/bugfix/t/mdev_27240.test
+1
-1
storage/spider/mysql-test/spider/r/ha_part.result
storage/spider/mysql-test/spider/r/ha_part.result
+2
-4
storage/spider/mysql-test/spider/t/ha_part.test
storage/spider/mysql-test/spider/t/ha_part.test
+2
-0
storage/spider/spd_table.cc
storage/spider/spd_table.cc
+0
-5
No files found.
storage/spider/mysql-test/spider/bugfix/r/mdev_26582.result
View file @
2a64e72a
...
...
@@ -7,5 +7,5 @@ CREATE TABLE t (i CHAR) ENGINE=SPIDER;
INSERT INTO t VALUES (0);
ERROR HY000: Unable to connect to foreign data source: localhost
INSERT t SELECT 1 ON DUPLICATE KEY UPDATE c=1;
ERROR
42S22: Unknown column 'c' in 'field list'
ERROR
HY000: Unable to connect to foreign data source: localhost
DROP DATABASE IF EXISTS auto_test_local;
storage/spider/mysql-test/spider/bugfix/r/mdev_27239.result
View file @
2a64e72a
...
...
@@ -8,11 +8,7 @@ CREATE DATABASE auto_test_local;
USE auto_test_local;
CREATE TABLE tbl_a (a INT) ENGINE=SPIDER;
FLUSH TABLE tbl_a WITH READ LOCK;
Warnings:
Error 1429 Unable to connect to foreign data source: localhost
Error 1429 Unable to connect to foreign data source: localhost
Error 1429 Unable to connect to foreign data source: localhost
Error 1429 Unable to connect to foreign data source: localhost
ERROR HY000: Unable to connect to foreign data source: localhost
BEGIN;
DROP DATABASE auto_test_local;
for master_1
...
...
storage/spider/mysql-test/spider/bugfix/r/mdev_27240.result
View file @
2a64e72a
...
...
@@ -5,7 +5,7 @@ CREATE DATABASE auto_test_local;
USE auto_test_local;
CREATE TABLE tbl_a (a INT KEY) ENGINE=SPIDER;
SELECT a.z FROM tbl_a AS a,tbl_a b WHERE a.z=b.z;
ERROR
42S22: Unknown column 'a.z' in 'field list'
ERROR
HY000: Unable to connect to foreign data source: localhost
ALTER TABLE tbl_a CHANGE c c INT;
ERROR 42S22: Unknown column 'c' in 'tbl_a'
LOCK TABLE tbl_a READ;
...
...
storage/spider/mysql-test/spider/bugfix/r/self_reference_multi.result
View file @
2a64e72a
...
...
@@ -12,9 +12,9 @@ alter table t2 ENGINE=Spider COMMENT='WRAPPER "mysql", srv "srv_self_reference_m
select * from t0;
ERROR HY000: An infinite loop is detected when opening table test.t0
select * from t1;
ERROR HY000: An infinite loop is detected when opening table test.t
0
ERROR HY000: An infinite loop is detected when opening table test.t
1
select * from t2;
ERROR HY000: An infinite loop is detected when opening table test.t
0
ERROR HY000: An infinite loop is detected when opening table test.t
2
drop table t0, t1, t2;
for master_1
for child2
...
...
storage/spider/mysql-test/spider/bugfix/t/mdev_26582.test
View file @
2a64e72a
...
...
@@ -15,7 +15,7 @@ USE auto_test_local;
CREATE
TABLE
t
(
i
CHAR
)
ENGINE
=
SPIDER
;
--
error
ER_CONNECT_TO_FOREIGN_DATA_SOURCE
INSERT
INTO
t
VALUES
(
0
);
--
error
ER_
BAD_FIELD_ERROR
--
error
ER_
CONNECT_TO_FOREIGN_DATA_SOURCE
INSERT
t
SELECT
1
ON
DUPLICATE
KEY
UPDATE
c
=
1
;
DROP
DATABASE
IF
EXISTS
auto_test_local
;
...
...
storage/spider/mysql-test/spider/bugfix/t/mdev_27239.test
View file @
2a64e72a
...
...
@@ -12,6 +12,7 @@ CREATE DATABASE auto_test_local;
USE
auto_test_local
;
CREATE
TABLE
tbl_a
(
a
INT
)
ENGINE
=
SPIDER
;
--
error
ER_CONNECT_TO_FOREIGN_DATA_SOURCE
FLUSH
TABLE
tbl_a
WITH
READ
LOCK
;
BEGIN
;
...
...
storage/spider/mysql-test/spider/bugfix/t/mdev_27240.test
View file @
2a64e72a
...
...
@@ -10,7 +10,7 @@ CREATE DATABASE auto_test_local;
USE
auto_test_local
;
CREATE
TABLE
tbl_a
(
a
INT
KEY
)
ENGINE
=
SPIDER
;
--
error
ER_
BAD_FIELD_ERROR
--
error
ER_
CONNECT_TO_FOREIGN_DATA_SOURCE
SELECT
a
.
z
FROM
tbl_a
AS
a
,
tbl_a
b
WHERE
a
.
z
=
b
.
z
;
--
error
ER_BAD_FIELD_ERROR
ALTER
TABLE
tbl_a
CHANGE
c
c
INT
;
...
...
storage/spider/mysql-test/spider/r/ha_part.result
View file @
2a64e72a
...
...
@@ -276,11 +276,9 @@ DROP TABLE ta_l2;
connection master_1;
CREATE TABLE t (c INT) PARTITION BY LIST COLUMNS (c) (PARTITION p DEFAULT ENGINE=SPIDER);
SHOW FIELDS FROM t;
Field Type Null Key Default Extra
c int(11) YES NULL
ERROR HY000: Unable to connect to foreign data source: localhost
SHOW FIELDS FROM t;
Field Type Null Key Default Extra
c int(11) YES NULL
ERROR HY000: Unable to connect to foreign data source: localhost
DROP TABLE t;
deinit
...
...
storage/spider/mysql-test/spider/t/ha_part.test
View file @
2a64e72a
...
...
@@ -985,7 +985,9 @@ if ($HAVE_PARTITION)
--
connection
master_1
CREATE
TABLE
t
(
c
INT
)
PARTITION
BY
LIST
COLUMNS
(
c
)
(
PARTITION
p
DEFAULT
ENGINE
=
SPIDER
);
--
error
ER_CONNECT_TO_FOREIGN_DATA_SOURCE
SHOW
FIELDS
FROM
t
;
--
error
ER_CONNECT_TO_FOREIGN_DATA_SOURCE
SHOW
FIELDS
FROM
t
;
DROP
TABLE
t
;
...
...
storage/spider/spd_table.cc
View file @
2a64e72a
...
...
@@ -4948,17 +4948,12 @@ SPIDER_SHARE *spider_get_share(
sts_sync
,
1
,
HA_STATUS_VARIABLE
|
HA_STATUS_CONST
|
HA_STATUS_AUTO
))
)
{
if
(
*
error_num
!=
ER_SPIDER_SYS_TABLE_VERSION_NUM
)
{
thd
->
clear_error
();
}
else
{
pthread_mutex_unlock
(
&
share
->
crd_mutex
);
pthread_mutex_unlock
(
&
share
->
sts_mutex
);
share
->
init_error
=
TRUE
;
share
->
init_error_time
=
(
time_t
)
time
((
time_t
*
)
0
);
share
->
init
=
TRUE
;
goto
error_after_alloc_dbton_handler
;
}
}
if
(
(
...
...
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