summaryrefslogtreecommitdiff
path: root/storage/myisammrg/ha_myisammrg.h
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2016-12-05 12:17:52 +0200
committerMonty <monty@mariadb.org>2017-12-03 13:58:34 +0200
commit7abe11499ad0a0805a85fa2c82747b50f4702f08 (patch)
tree9bef0aabf673f7562d1e74c44abd06f30399f9a1 /storage/myisammrg/ha_myisammrg.h
parent3d1d4b874d442de7ecffb59aee5d2579944af50b (diff)
downloadmariadb-git-7abe11499ad0a0805a85fa2c82747b50f4702f08.tar.gz
MDEV 7701 extra() calls for VP engine
Added Spider patches: 003_mariadb-10.0.15.vp.diff 060_mariadb-10.2.0.partition_reset_top_table_fields.diff - Support HA_EXTRA_ADD_CHILDREN_LIST,HA_EXTRA_ATTACH_CHILDREN, HA_EXTRA_IS_ATTACHED_CHILDREN and HA_EXTRA_DETACH_CHILDREN in partition handler for handlers that has HA_CAN_MULTISTEPL_MERGE flag - Added HA_CAN_MULTISTEPL_MERGE to MERGE handler. - Added handler::get_child_handlers() - Change m_num_lock to contain total number of locks. This was needed as we now adjust number of locks when extra(HA_EXTRA_ATTACH_CHILDREN) is called.
Diffstat (limited to 'storage/myisammrg/ha_myisammrg.h')
-rw-r--r--storage/myisammrg/ha_myisammrg.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/myisammrg/ha_myisammrg.h b/storage/myisammrg/ha_myisammrg.h
index 6ace880ab99..1a88cc053e4 100644
--- a/storage/myisammrg/ha_myisammrg.h
+++ b/storage/myisammrg/ha_myisammrg.h
@@ -91,7 +91,7 @@ public:
HA_ANY_INDEX_MAY_BE_UNIQUE | HA_CAN_BIT_FIELD |
HA_HAS_RECORDS | HA_CAN_EXPORT |
HA_NO_COPY_ON_ALTER |
- HA_DUPLICATE_POS);
+ HA_DUPLICATE_POS | HA_CAN_MULTISTEP_MERGE);
}
ulong index_flags(uint inx, uint part, bool all_parts) const
{