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
d6315e29
Commit
d6315e29
authored
May 21, 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
(part 2)
parent
ec043ace
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
27 additions
and
17 deletions
+27
-17
mysql-test/suite/federated/federated.result
mysql-test/suite/federated/federated.result
+13
-0
mysql-test/suite/federated/federated.test
mysql-test/suite/federated/federated.test
+12
-0
mysql-test/suite/federated/federatedx.result
mysql-test/suite/federated/federatedx.result
+0
-7
mysql-test/suite/federated/federatedx.test
mysql-test/suite/federated/federatedx.test
+0
-7
storage/federatedx/ha_federatedx.cc
storage/federatedx/ha_federatedx.cc
+2
-3
No files found.
mysql-test/suite/federated/federated.result
0 → 100644
View file @
d6315e29
CREATE DATABASE federated;
CREATE DATABASE federated;
CREATE TABLE t1 (a INT) ENGINE=FEDERATED CONNECTION='non_existing';
ERROR HY000: server name: 'non_existing' doesn't exist!
SHOW WARNINGS;
Level Code Message
Error 1 server name: 'non_existing' doesn't exist!
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;
DROP DATABASE IF EXISTS federated;
mysql-test/suite/federated/federated.test
0 → 100644
View file @
d6315e29
source
include
/
federated
.
inc
;
#
# 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
;
mysql-test/suite/federated/federatedx.result
View file @
d6315e29
...
@@ -2157,13 +2157,6 @@ DROP TABLE federated.t1;
...
@@ -2157,13 +2157,6 @@ DROP TABLE federated.t1;
End of 5.1 tests
End of 5.1 tests
SET @@GLOBAL.CONCURRENT_INSERT= @OLD_MASTER_CONCURRENT_INSERT;
SET @@GLOBAL.CONCURRENT_INSERT= @OLD_MASTER_CONCURRENT_INSERT;
SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLAVE_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 TABLE IF EXISTS federated.t1;
DROP DATABASE IF EXISTS federated;
DROP DATABASE IF EXISTS federated;
DROP TABLE IF EXISTS federated.t1;
DROP TABLE IF EXISTS federated.t1;
...
...
mysql-test/suite/federated/federatedx.test
View file @
d6315e29
...
@@ -2000,11 +2000,4 @@ SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLAVE_CONCURRENT_INSERT;
...
@@ -2000,11 +2000,4 @@ SET @@GLOBAL.CONCURRENT_INSERT= @OLD_SLAVE_CONCURRENT_INSERT;
connection
default
;
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
;
source
include
/
federated_cleanup
.
inc
;
storage/federatedx/ha_federatedx.cc
View file @
d6315e29
...
@@ -585,9 +585,8 @@ int get_connection(MEM_ROOT *mem_root, FEDERATEDX_SHARE *share)
...
@@ -585,9 +585,8 @@ int get_connection(MEM_ROOT *mem_root, FEDERATEDX_SHARE *share)
DBUG_RETURN
(
0
);
DBUG_RETURN
(
0
);
error:
error:
sprintf
(
error_buffer
,
"server name: '%s' doesn't exist!"
,
my_printf_error
(
error_num
,
"server name: '%s' doesn't exist!"
,
share
->
connection_string
);
MYF
(
0
),
share
->
connection_string
);
my_error
(
error_num
,
MYF
(
0
),
error_buffer
);
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