diff options
| author | unknown <tsmith@ramayana.hindu.god> | 2007-07-31 17:36:19 -0600 |
|---|---|---|
| committer | unknown <tsmith@ramayana.hindu.god> | 2007-07-31 17:36:19 -0600 |
| commit | 82fbe7a418f7048496bc95f754d97782a1984e93 (patch) | |
| tree | e4a69058f978ea7d9c5c6ec1f615a82b87abefd8 /storage/federated | |
| parent | 5713d2e069017b8fbfda9dcf5c3380534e39a52a (diff) | |
| parent | d0e8d1ab5401a2cc7ce8f75e15340b67fed6cfbf (diff) | |
| download | mariadb-git-82fbe7a418f7048496bc95f754d97782a1984e93.tar.gz | |
Merge ramayana.hindu.god:/home/tsmith/m/bk/51
into ramayana.hindu.god:/home/tsmith/m/bk/maint/jul31/51
mysql-test/r/federated.result:
Auto merged
mysql-test/t/federated.test:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
storage/federated/ha_federated.h:
Auto merged
storage/innobase/handler/ha_innodb.cc:
Auto merged
mysql-test/include/mix1.inc:
Manual merge
mysql-test/r/innodb_mysql.result:
Manual merge
Diffstat (limited to 'storage/federated')
| -rw-r--r-- | storage/federated/ha_federated.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/federated/ha_federated.h b/storage/federated/ha_federated.h index 2aa2fac63f1..40bcf9cc402 100644 --- a/storage/federated/ha_federated.h +++ b/storage/federated/ha_federated.h @@ -165,6 +165,7 @@ public: 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 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 |