diff options
| author | monty@hundin.mysql.fi <> | 2002-01-05 22:51:42 +0200 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2002-01-05 22:51:42 +0200 |
| commit | ff173891169e92c38ac88fcc7b836f616ac3b1db (patch) | |
| tree | aee8644482b4b6ee28e2b60a28829fa32f99a2b0 /include | |
| parent | fd81437a6b91b28fd89aca4dedffa5f5d7e6e685 (diff) | |
| download | mariadb-git-ff173891169e92c38ac88fcc7b836f616ac3b1db.tar.gz | |
Fix for FLUSH QUERY CACHE
Fix for new bug in CREATE TABLE when sorting keys.
Diffstat (limited to 'include')
| -rw-r--r-- | include/my_base.h | 22 | ||||
| -rw-r--r-- | include/myisam.h | 1 | ||||
| -rw-r--r-- | include/mysql_com.h | 3 |
3 files changed, 24 insertions, 2 deletions
diff --git a/include/my_base.h b/include/my_base.h index 89d58bb3d51..dc88e248469 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -56,7 +56,19 @@ enum ha_rkey_function { HA_READ_AFTER_KEY, /* Find next rec. after key-record */ HA_READ_BEFORE_KEY, /* Find next rec. before key-record */ HA_READ_PREFIX, /* Key which as same prefix */ - HA_READ_PREFIX_LAST /* Last key with the same prefix */ + HA_READ_PREFIX_LAST, /* Last key with the same prefix */ + HA_READ_MBR_CONTAIN, + HA_READ_MBR_INTERSECT, + HA_READ_MBR_WITHIN, + HA_READ_MBR_DISJOINT, + HA_READ_MBR_EQUAL +}; + + /* Key algorithm types */ + +enum ha_key_alg { + HA_KEY_ALG_BTREE=0, /* B-tree, default one */ + HA_KEY_ALG_RTREE=1 /* R-tree, for spatial searches */ }; /* The following is parameter to ha_extra() */ @@ -136,6 +148,8 @@ enum ha_base_keytype { #define HA_BINARY_PACK_KEY 32 /* Packing of all keys to prev key */ #define HA_FULLTEXT 128 /* SerG: for full-text search */ #define HA_UNIQUE_CHECK 256 /* Check the key for uniqueness */ +#define HA_SPATIAL 1024 /* Alex Barkov: for spatial search */ + /* Automatic bits in key-flag */ @@ -239,6 +253,12 @@ enum ha_base_keytype { #define SEARCH_UPDATE 64 #define SEARCH_PREFIX 128 #define SEARCH_LAST 256 +#define MBR_CONTAIN 512 +#define MBR_INTERSECT 1024 +#define MBR_WITHIN 2048 +#define MBR_DISJOINT 4096 +#define MBR_EQUAL 8192 +#define MBR_DATA 16384 /* bits in opt_flag */ #define QUICK_USED 1 diff --git a/include/myisam.h b/include/myisam.h index 80dc9f73f5b..35953496a47 100644 --- a/include/myisam.h +++ b/include/myisam.h @@ -126,6 +126,7 @@ typedef struct st_mi_keydef /* Key definition with open & info */ uint16 keysegs; /* Number of key-segment */ uint16 flag; /* NOSAME, PACK_USED */ + uint8 key_alg; /* BTREE, RTREE */ uint16 block_length; /* Length of keyblock (auto) */ uint16 underflow_block_length; /* When to execute underflow */ uint16 keylength; /* Tot length of keyparts (auto) */ diff --git a/include/mysql_com.h b/include/mysql_com.h index a4e0b5f0223..eb3671ddfbd 100644 --- a/include/mysql_com.h +++ b/include/mysql_com.h @@ -150,7 +150,8 @@ enum enum_field_types { FIELD_TYPE_DECIMAL, FIELD_TYPE_TINY, FIELD_TYPE_LONG_BLOB=251, FIELD_TYPE_BLOB=252, FIELD_TYPE_VAR_STRING=253, - FIELD_TYPE_STRING=254 + FIELD_TYPE_STRING=254, + FIELD_TYPE_GEOMETRY=255 }; #define FIELD_TYPE_CHAR FIELD_TYPE_TINY /* For compability */ |