mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-29 02:05:57 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDEV-388 Creating a federated table with a non-existing server returns a random error code

Browse source
This commit is contained in:
Sergei Golubchik 2013-05-20 23:58:44 +02:00
parent 7e4150d7cd
commit 62ab6982a4
4 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
mysql-test/suite/federated/federatedx.result
View file

@ -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;

8
mysql-test/suite/federated/federatedx.test
View file

@ -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;

2
storage/federated/ha_federated.cc
View file

@ -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);
}

2
storage/federatedx/ha_federatedx.cc
View file

@ -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);
}