diff options
| author | Igor Babaev <igor@askmonty.org> | 2012-03-01 14:22:22 -0800 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2012-03-01 14:22:22 -0800 |
| commit | 8b469eb5151cb1b7da00cee3a7b42c10bd7ff51e (patch) | |
| tree | a2dd09bd1fd3ba15b098eebf8b581bef7664b212 /storage/maria/ma_info.c | |
| parent | 29b0b0b5de46c6950b8b53314c74f6f458ba1a98 (diff) | |
| parent | 000deedf3b708681951af6a0629af89c1f5ee85a (diff) | |
| download | mariadb-git-8b469eb5151cb1b7da00cee3a7b42c10bd7ff51e.tar.gz | |
Merge 5.3->5.5.
Diffstat (limited to 'storage/maria/ma_info.c')
| -rw-r--r-- | storage/maria/ma_info.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/maria/ma_info.c b/storage/maria/ma_info.c index fdd9ba7d2c6..97b5b8b7f7b 100644 --- a/storage/maria/ma_info.c +++ b/storage/maria/ma_info.c @@ -31,7 +31,7 @@ MARIA_RECORD_POS maria_position(MARIA_HA *info) uint maria_max_key_length() { uint tmp= (_ma_max_key_length() - 8 - HA_MAX_KEY_SEG*3); - return min(HA_MAX_KEY_BUFF, tmp); + return min(HA_MAX_KEY_LENGTH, tmp); } /* Get information about the table */ |