diff options
| author | unknown <patg@krsna.patg.net> | 2005-02-23 00:29:57 -0800 |
|---|---|---|
| committer | unknown <patg@krsna.patg.net> | 2005-02-23 00:29:57 -0800 |
| commit | aec302676a839c41e69399bf73091273f1c0b60f (patch) | |
| tree | e5e25ce017a261231b13aa0deb1e42dacb10c6d8 /sql/ha_federated.h | |
| parent | 65492347e86bfddd54627c0f6dda483e075a5ec6 (diff) | |
| download | mariadb-git-aec302676a839c41e69399bf73091273f1c0b60f.tar.gz | |
WL #2094 Federated Storage Handler
This is the first changeset of suggested changes recommended in Kostja's
review of my patch, 1.1846, which includes only functionality changes.
Style changes/Documentation patch to follow.
include/mysql.h:
removed declaration of cli_fetch_lengths per Kostja's suggestion
libmysql/libmysql.c:
moved mysql_fetch_lengths to client.c (for server to access) per Kostja's
suggestion
sql-common/client.c:
added back 'static' to function definition, added mysql_fetch_lengths
sql/ha_federated.cc:
changed to use defines as opposed to hardcoded values
sql/ha_federated.h:
took out duplicate table_flag, fixed a resolve mistake
Diffstat (limited to 'sql/ha_federated.h')
| -rwxr-xr-x | sql/ha_federated.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/ha_federated.h b/sql/ha_federated.h index f685aa9e3f9..22fc03e9eec 100755 --- a/sql/ha_federated.h +++ b/sql/ha_federated.h @@ -76,7 +76,6 @@ private: return errorcode otherwise */ uint convert_row_to_internal_format(byte *buf, MYSQL_ROW row); - bool create_where_from_key(String *to, KEY *key_info, const byte *key, uint key_length); bool create_where_from_key(String *to, KEY *key_info, const byte *key, uint key_length); @@ -106,9 +105,9 @@ public: */ ulong table_flags() const { - return (HA_TABLE_SCAN_ON_INDEX | HA_NOT_EXACT_COUNT | - HA_PRIMARY_KEY_IN_READ_INDEX | HA_FILE_BASED | HA_AUTO_PART_KEY | - HA_TABLE_SCAN_ON_INDEX | HA_CAN_INDEX_BLOBS); + return (HA_TABLE_SCAN_ON_INDEX | HA_NOT_EXACT_COUNT | + HA_PRIMARY_KEY_IN_READ_INDEX | HA_FILE_BASED | + HA_AUTO_PART_KEY | HA_CAN_INDEX_BLOBS); } /* This is a bitmap of flags that says how the storage engine |