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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
62ab6982
Commit
62ab6982
authored
May 20, 2013
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-388 Creating a federated table with a non-existing server returns a random error code
parent
7e4150d7
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
2 deletions
+17
-2
mysql-test/suite/federated/federatedx.result
mysql-test/suite/federated/federatedx.result
+7
-0
mysql-test/suite/federated/federatedx.test
mysql-test/suite/federated/federatedx.test
+8
-0
storage/federated/ha_federated.cc
storage/federated/ha_federated.cc
+1
-1
storage/federatedx/ha_federatedx.cc
storage/federatedx/ha_federatedx.cc
+1
-1
No files found.
mysql-test/suite/federated/federatedx.result
View file @
62ab6982
...
...
@@ -2157,6 +2157,13 @@ DROP TABLE federated.t1;
End of 5.1 tests
SET @@GLOBAL.CONCURRENT_INSERT= @OLD_MASTER_CONCURRENT_INSERT;
SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLAVE_CONCURRENT_INSERT;
CREATE TABLE t1 (a INT) ENGINE=FEDERATED CONNECTION='non_existing';
ERROR HY000: Can't create/write to file 'server name: 'non_existing' doesn't exist!' (Errcode: 16)
SHOW WARNINGS;
Level Code Message
Error 1 Can't create/write to file 'server name: 'non_existing' doesn't exist!' (Errcode: 16)
Error 1 Can't create/write to file 'non_existing' (Errcode: 14)
Error 1005 Can't create table 'test.t1' (errno: 1)
DROP TABLE IF EXISTS federated.t1;
DROP DATABASE IF EXISTS federated;
DROP TABLE IF EXISTS federated.t1;
...
...
mysql-test/suite/federated/federatedx.test
View file @
62ab6982
...
...
@@ -1999,4 +1999,12 @@ connection slave;
SET
@@
GLOBAL
.
CONCURRENT_INSERT
=
@
OLD_SLAVE_CONCURRENT_INSERT
;
connection
default
;
#
# MDEV-388 Creating a federated table with a non-existing server returns a random error code
#
--
error
1
CREATE
TABLE
t1
(
a
INT
)
ENGINE
=
FEDERATED
CONNECTION
=
'non_existing'
;
SHOW
WARNINGS
;
source
include
/
federated_cleanup
.
inc
;
storage/federated/ha_federated.cc
View file @
62ab6982
...
...
@@ -587,7 +587,7 @@ static int parse_url_error(FEDERATED_SHARE *share, TABLE *table, int error_num)
buf_len
=
min
(
table
->
s
->
connect_string
.
length
,
FEDERATED_QUERY_BUFFER_SIZE
-
1
);
strmake
(
buf
,
table
->
s
->
connect_string
.
str
,
buf_len
);
my_error
(
error_num
,
MYF
(
0
),
buf
);
my_error
(
error_num
,
MYF
(
0
),
buf
,
14
);
DBUG_RETURN
(
error_num
);
}
...
...
storage/federatedx/ha_federatedx.cc
View file @
62ab6982
...
...
@@ -525,7 +525,7 @@ static int parse_url_error(FEDERATEDX_SHARE *share, TABLE *table, int error_num)
buf_len
=
min
(
table
->
s
->
connect_string
.
length
,
FEDERATEDX_QUERY_BUFFER_SIZE
-
1
);
strmake
(
buf
,
table
->
s
->
connect_string
.
str
,
buf_len
);
my_error
(
error_num
,
MYF
(
0
),
buf
);
my_error
(
error_num
,
MYF
(
0
),
buf
,
14
);
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