5.5 merge

This commit is contained in:
Sergei Golubchik 2014-05-09 12:35:11 +02:00
commit d3e2e1243b
1865 changed files with 92783 additions and 80381 deletions

View file

@ -346,7 +346,7 @@ public:
/* fix server to be able to get remote server index flags */
ulong index_flags(uint inx, uint part, bool all_parts) const
{
return (HA_READ_NEXT | HA_READ_RANGE | HA_READ_AFTER_KEY);
return (HA_READ_NEXT | HA_READ_RANGE);
}
uint max_supported_record_length() const { return HA_MAX_REC_LENGTH; }
uint max_supported_keys() const { return MAX_KEY; }