diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-11-04 16:53:10 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-11-04 16:53:10 +0200 |
| commit | 3797ca41b39c862cf4733eadea8c91ed138ca1a4 (patch) | |
| tree | ec51a2bcd2a7c071f89d3177ca7914dccd111c9f /include/my_base.h | |
| parent | 5789f96c624d00aeef137602ab0c4828620748e8 (diff) | |
| parent | 3bac9cf7fe12c1b1c644ac7963c701b79b3127f3 (diff) | |
| download | mariadb-git-3797ca41b39c862cf4733eadea8c91ed138ca1a4.tar.gz | |
Automatic merge with 5.1
Diffstat (limited to 'include/my_base.h')
| -rw-r--r-- | include/my_base.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/my_base.h b/include/my_base.h index 8065441d4d7..8e6436bde70 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -50,6 +50,7 @@ #define HA_OPEN_COPY 256 /* Open copy (for repair) */ /* Internal temp table, used for temporary results */ #define HA_OPEN_INTERNAL_TABLE 512 +#define HA_OPEN_MERGE_TABLE 1024 /* The following is parameter to ha_rkey() how to use key */ @@ -196,6 +197,7 @@ enum ha_extra_function { */ HA_EXTRA_ATTACH_CHILDREN, HA_EXTRA_DETACH_CHILDREN, + HA_EXTRA_DETACH_CHILD, /* Inform handler we will force a close as part of flush */ HA_EXTRA_PREPARE_FOR_FORCED_CLOSE }; |