diff options
| author | unknown <monty@tik.mysql.fi> | 2002-01-12 15:42:54 +0200 |
|---|---|---|
| committer | unknown <monty@tik.mysql.fi> | 2002-01-12 15:42:54 +0200 |
| commit | 71a5af5b52642cbe64960275f1994f5a57832ff3 (patch) | |
| tree | 5c9b603230485a57877f3b066d095b6668bd1d2e /include | |
| parent | e8da7ea09ea7ccde96becbd04364df8c4e8424bd (diff) | |
| download | mariadb-git-71a5af5b52642cbe64960275f1994f5a57832ff3.tar.gz | |
Added support of null keys in HEAP tables
Added ORDER BY optimization
Docs/manual.texi:
Added ORDER BY optimisation section
heap/_check.c:
Cleanup
heap/heapdef.h:
Added support of null keys in HEAP tables
heap/hp_hash.c:
Added support of null keys in HEAP tables
heap/hp_open.c:
Added support of null keys in HEAP tables
heap/hp_test2.c:
Added support of null keys in HEAP tables
heap/hp_write.c:
Added support of null keys in HEAP tables
include/heap.h:
Added support of null keys in HEAP tables
include/my_base.h:
Support for hash algoritm
isam/static.c:
Cleanup
myisam/mi_static.c:
Cleanup
sql/Makefile.am:
Rename innobase -> innodb
sql/ha_berkeley.cc:
Added ORDER BY optimization
sql/ha_berkeley.h:
Added ORDER BY optimization
sql/ha_heap.cc:
Added support for NULL keys
sql/ha_heap.h:
Added support for NULL keys
sql/ha_isam.cc:
Added ORDER BY optimization
sql/ha_isam.h:
Added ORDER BY optimization
sql/ha_isammrg.h:
Added ORDER BY optimization
sql/ha_myisam.cc:
Added ORDER BY optimization
sql/ha_myisam.h:
Added ORDER BY optimization
sql/ha_myisammrg.cc:
Added ORDER BY optimization
sql/ha_myisammrg.h:
Added ORDER BY optimization
sql/handler.cc:
Rename innobase -> innodb
sql/handler.h:
Rename innobase -> innodb
sql/ha_innodb.cc:
Rename innobase -> innodb
sql/ha_innodb.h:
Rename innobase -> innodb
sql/mysqld.cc:
Rename innobase -> innodb
sql/sql_delete.cc:
Rename innobase -> innodb
sql/sql_select.cc:
Added ORDER BY optimization
sql/sql_select.h:
Added ORDER BY optimization
Diffstat (limited to 'include')
| -rw-r--r-- | include/heap.h | 4 | ||||
| -rw-r--r-- | include/my_base.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/heap.h b/include/heap.h index 9efb873ec93..02b04e2b3ec 100644 --- a/include/heap.h +++ b/include/heap.h @@ -78,11 +78,13 @@ typedef struct st_hp_keyseg /* Key-portion */ uint start; /* Start of key in record (from 0) */ uint length; /* Keylength */ uint type; + uint null_bit; /* bit set in row+null_pos */ + uint null_pos; } HP_KEYSEG; typedef struct st_hp_keydef /* Key definition with open */ { - uint flag; /* NOSAME */ + uint flag; /* HA_NOSAME | HA_NULL_PART_KEY */ uint keysegs; /* Number of key-segment */ uint length; /* Length of key (automatic) */ HP_KEYSEG *seg; diff --git a/include/my_base.h b/include/my_base.h index dc88e248469..6494fa93ab9 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -68,7 +68,8 @@ enum ha_rkey_function { enum ha_key_alg { HA_KEY_ALG_BTREE=0, /* B-tree, default one */ - HA_KEY_ALG_RTREE=1 /* R-tree, for spatial searches */ + HA_KEY_ALG_RTREE=1, /* R-tree, for spatial searches */ + HA_KEY_ALG_HASH=2 /* HASH keys (HEAP tables) */ }; /* The following is parameter to ha_extra() */ |