diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:12:12 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2011-07-02 22:12:12 +0200 |
| commit | b4a0b2c2f862ab0de853dc34e1e56f6159043e45 (patch) | |
| tree | 18a0c25fdc9ac0076da19247666414a46434b85e /storage/federated | |
| parent | 9809f05199aeb0b67991fac41bd86f38730768dc (diff) | |
| download | mariadb-git-b4a0b2c2f862ab0de853dc34e1e56f6159043e45.tar.gz | |
post-merge fixes.
most tests pass.
5.3 merge is next
Diffstat (limited to 'storage/federated')
| -rw-r--r-- | storage/federated/ha_federated.cc | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/storage/federated/ha_federated.cc b/storage/federated/ha_federated.cc index 17412808d44..ab338d9281f 100644 --- a/storage/federated/ha_federated.cc +++ b/storage/federated/ha_federated.cc @@ -390,6 +390,12 @@ #include <mysql/plugin.h> +#ifdef I_AM_PARANOID +#define MIN_PORT 1023 +#else +#define MIN_PORT 0 +#endif + /* Variables for federated share methods */ static HASH federated_open_tables; // To track open tables mysql_mutex_t federated_mutex; // To init the hash @@ -624,11 +630,7 @@ int get_connection(MEM_ROOT *mem_root, FEDERATED_SHARE *share) share->username= server->username; share->password= server->password; share->database= server->db; -#ifndef I_AM_PARANOID - share->port= server->port > 0 && server->port < 65536 ? -#else - share->port= server->port > 1023 && server->port < 65536 ? -#endif + share->port= server->port > MIN_PORT && server->port < 65536 ? (ushort) server->port : MYSQL_PORT; share->hostname= server->host; if (!(share->socket= server->socket) && @@ -3044,16 +3046,6 @@ int ha_federated::delete_all_rows() /* - Used to manually truncate the table via a delete of all rows in a table. -*/ - -int ha_federated::truncate() -{ - return delete_all_rows(); -} - - -/* The idea with handler::store_lock() is the following: The statement decided which locks we should need for the table |