mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
f015cbdc7e
Add ISAM to Windows version Fix of test results Fixes for NULL keys in HEAP tables. Docs/manual.texi: Changelog heap/hp_open.c: Add support for NULL=NULL in keys (for GROUP BY) heap/hp_rkey.c: Cleanup heap/hp_write.c: Cleanup include/config-win.h: Add ISAM to Windows version include/my_base.h: Add support for NULL=NULL in keys (for GROUP BY) libmysqld/Makefile.am: Rename of innobase to innodb myisam/mi_write.c: Add support for NULL=NULL in keys (for GROUP BY) BitKeeper/etc/ignore: Added libmysqld/ha_innodb.cc to the ignore list mysql-test/r/group_by.result: Test of NULL keys in HEAP tables mysql-test/r/heap.result: Test of NULL keys in HEAP tables mysql-test/r/null.result: Cleanup mysql-test/r/order_by.result: Fix for result of new ORDER BY optimization mysql-test/t/group_by.test: Test of NULL keys in HEAP tables mysql-test/t/heap.test: Test of NULL keys in HEAP tables mysql-test/t/null.test: Cleanup sql/ha_heap.cc: Add support of NULL keys sql/item_strfunc.h: Fix for BINARY and CAST functions sql/item_timefunc.h: Fix for BINARY and CAST functions sql/sql_parse.cc: Cleanup sql/sql_select.cc: Add support for NULL=NULL in keys (for GROUP BY)
51 lines
1.6 KiB
C
51 lines
1.6 KiB
C
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#include "heapdef.h"
|
|
|
|
int heap_rkey(HP_INFO *info, byte *record, int inx, const byte *key)
|
|
{
|
|
byte *pos;
|
|
HP_SHARE *share=info->s;
|
|
DBUG_ENTER("heap_rkey");
|
|
DBUG_PRINT("enter",("base: %lx inx: %d",info,inx));
|
|
|
|
if ((uint) inx >= share->keys)
|
|
{
|
|
DBUG_RETURN(my_errno=HA_ERR_WRONG_INDEX);
|
|
}
|
|
info->lastinx=inx;
|
|
info->current_record = (ulong) ~0L; /* For heap_rrnd() */
|
|
|
|
if (!(pos=_hp_search(info,share->keydef+inx,key,0)))
|
|
{
|
|
info->update=0;
|
|
DBUG_RETURN(my_errno);
|
|
}
|
|
memcpy(record,pos,(size_t) share->reclength);
|
|
info->update=HA_STATE_AKTIV;
|
|
if (!(share->keydef[inx].flag & HA_NOSAME))
|
|
memcpy(info->lastkey,key,(size_t) share->keydef[inx].length);
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
/* Quick find of record */
|
|
|
|
gptr heap_find(HP_INFO *info, int inx, const byte *key)
|
|
{
|
|
return _hp_search(info,info->s->keydef+inx,key,0);
|
|
}
|