diff options
| author | unknown <cmiller@zippy.cornsilk.net> | 2007-07-19 15:33:27 -0400 |
|---|---|---|
| committer | unknown <cmiller@zippy.cornsilk.net> | 2007-07-19 15:33:27 -0400 |
| commit | 6a5fff64a3a264c6ddbbd7e60e43fe411ff3385f (patch) | |
| tree | 76175d80e2aeaf15c9423aa10bd977e9dc14b62f /sql/ha_federated.h | |
| parent | 04aba6ec5d0dc4206b0c74078ad30dd5dcc06bee (diff) | |
| parent | 99af63e53d1631fd528b5abdd9df78cf5d9296b0 (diff) | |
| download | mariadb-git-6a5fff64a3a264c6ddbbd7e60e43fe411ff3385f.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint
mysql-test/t/federated.test:
Auto merged
sql/ha_federated.h:
Auto merged
mysql-test/r/federated.result:
Manual merge.
Diffstat (limited to 'sql/ha_federated.h')
| -rw-r--r-- | sql/ha_federated.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/ha_federated.h b/sql/ha_federated.h index b5e1c217eb5..2e510fa87da 100644 --- a/sql/ha_federated.h +++ b/sql/ha_federated.h @@ -37,6 +37,7 @@ #define FEDERATED_QUERY_BUFFER_SIZE STRING_BUFFER_USUAL_SIZE * 5 #define FEDERATED_RECORDS_IN_RANGE 2 +#define FEDERATED_MAX_KEY_LENGTH 3500 // Same as innodb #define FEDERATED_INFO " SHOW TABLE STATUS LIKE " #define FEDERATED_INFO_LEN sizeof(FEDERATED_INFO) #define FEDERATED_SELECT "SELECT " @@ -228,7 +229,8 @@ public: uint max_supported_record_length() const { return HA_MAX_REC_LENGTH; } uint max_supported_keys() const { return MAX_KEY; } uint max_supported_key_parts() const { return MAX_REF_PARTS; } - uint max_supported_key_length() const { return MAX_KEY_LENGTH; } + uint max_supported_key_length() const { return FEDERATED_MAX_KEY_LENGTH; } + uint max_supported_key_part_length() const { return FEDERATED_MAX_KEY_LENGTH; } /* Called in test_quick_select to determine if indexes should be used. Normally, we need to know number of blocks . For federated we need to |