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 /heap/hp_write.c | |
| 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 'heap/hp_write.c')
| -rw-r--r-- | heap/hp_write.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/heap/hp_write.c b/heap/hp_write.c index 0d68bb96580..a219c8be23a 100644 --- a/heap/hp_write.c +++ b/heap/hp_write.c @@ -239,7 +239,9 @@ int _hp_write_key(register HP_SHARE *info, HP_KEYDEF *keyinfo, } /* Check if dupplicated keys */ - if ((keyinfo->flag & HA_NOSAME) && pos == gpos) + if ((keyinfo->flag & HA_NOSAME) && pos == gpos && + (!(keyinfo->flag & HA_NULL_PART_KEY) || + !hp_if_null_in_key(keyinfo, record))) { pos=empty; do |