diff options
author | unknown <cmiller@zippy.cornsilk.net> | 2007-07-19 15:34:40 -0400 |
---|---|---|
committer | unknown <cmiller@zippy.cornsilk.net> | 2007-07-19 15:34:40 -0400 |
commit | f812c6b786248717b9b6d0f092280ea0a9491d5b (patch) | |
tree | 6350ee3570c12299e95a7fe5dfde19386781d936 /storage/federated | |
parent | dc0ba2ef9a9023fec58382198e17916c3cedc027 (diff) | |
parent | 8b8b430bbccc01717e3eb50e4e452cf415292d00 (diff) | |
download | mariadb-git-f812c6b786248717b9b6d0f092280ea0a9491d5b.tar.gz |
Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26909/my50-bug26909
into zippy.cornsilk.net:/home/cmiller/work/mysql/bug26909/my51-bug26909
mysql-test/r/federated.result:
Auto merged
mysql-test/t/federated.test:
Auto merged
storage/federated/ha_federated.h:
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 861f50fad06..14c2ee1e6c8 100644 --- a/storage/federated/ha_federated.h +++ b/storage/federated/ha_federated.h @@ -151,6 +151,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 |