mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
8eaef91fff
Add support for VARCHAR with 1 or 2 length bytes Enable VARCHAR packing in MyISAM files (previous patch didn't pack data properly) Give error if we got problems in temporary tables during a SELECT Don't use new table generated by ALTER TABLE if index generation fails Fixed wrong call by range_end() (Could cause an ASSERT in debug mode) BUILD/SETUP.sh: Add flags for Intel 64 dbug/dbug.c: Add 0x before pointers (to help with debugging) heap/_check.c: Add 0x before pointers (to help with debugging) heap/hp_create.c: Add support for VARCHAR with 1 or 2 length bytes heap/hp_delete.c: Add 0x before pointers heap/hp_hash.c: Add support for VARCHAR with 1 or 2 length bytes Added more debugging heap/hp_open.c: Add 0x before pointers heap/hp_rkey.c: Add 0x before pointers heap/hp_rrnd.c: Add 0x before pointers heap/hp_write.c: Add 0x before pointers include/my_base.h: Add support for VARCHAR with 1 or 2 length bytes myisam/ft_static.c: Add support for VARCHAR with 1 or 2 length bytes myisam/ft_test1.c: Add support for VARCHAR with 1 or 2 length bytes Fixed indentation (This file should probably be deleted as it doesn't compile) myisam/ft_update.c: Add support for VARCHAR with 1 or 2 length bytes Fixed indentation Removed some not needed 'else' myisam/mi_check.c: Don't give an error for tables packed with myisampack myisam/mi_checksum.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_create.c: Add support for VARCHAR with 1 or 2 length bytes Store in number of pack-length-bytes in keyseg->bit_start myisam/mi_dbug.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_dynrec.c: Add support for VARCHAR with 1 or 2 length bytes (old code in _mi_rec_unpack() didn't really work with VARCHAR's) myisam/mi_key.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_open.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_packrec.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_search.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_test1.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_test3.c: Add support for VARCHAR with 1 or 2 length bytes myisam/mi_test_all.res: Update results myisam/mi_unique.c: Add support for VARCHAR with 1 or 2 length bytes myisam/myisampack.c: Add support for VARCHAR with 1 or 2 length bytes mysql-test/include/varchar.inc: Added more tests mysql-test/r/bdb.result: Update results after new tests mysql-test/r/information_schema.result: Update results mysql-test/r/innodb.result: Update results mysql-test/r/myisam.result: Update results after new tests mysql-test/r/ps_1general.result: Update results mysql-test/t/bdb.test: Shorter comments mysys/list.c: Add 0x before pointers mysys/my_handler.c: Add support for VARCHAR with 1 or 2 length bytes mysys/raid.cc: Add 0x before pointers sql/field.cc: Add support for VARCHAR with 1 or 2 length bytes sql/field.h: Add support for VARCHAR with 1 or 2 length bytes sql/field_conv.cc: Add support for VARCHAR with 1 or 2 length bytes sql/ha_berkeley.cc: Add support for VARCHAR with 1 or 2 length bytes sql/ha_heap.cc: Add support for VARCHAR with 1 or 2 length bytes sql/ha_myisam.cc: Ensure that enable_indexes() will report an error if it fails Enable VARCHAR packing for MyISAM files sql/item_sum.cc: Change key_cmp -> cmp() as we are comparing fields, not key segements sql/opt_range.cc: Add support for VARCHAR with 1 or 2 length bytes Change range_end to call ha_index_or_rnd_end() as in some error cases we may be in rnd mode when we abort sql/sql_base.cc: Remove compiler warning sql/sql_parse.cc: Move length checking code to sql_table.cc (as we don't have character set for fields at this stage) sql/sql_select.cc: Add support for VARCHAR with 1 or 2 length bytes Ensure that we report an error if we get an error while writing to internal temporary tables sql/sql_select.h: Add support for VARCHAR with 1 or 2 length bytes sql/sql_show.cc: Fix typo in comment sql/sql_table.cc: Don't use new table generated by ALTER TABLE if index generation fails vio/vio.c: Fixed DBUG info vio/viosocket.c: Fixed DBUG info vio/viossl.c: Fixed DBUG info vio/viosslfactories.c: Fixed DBUG info
81 lines
2.7 KiB
C
81 lines
2.7 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,
|
|
uint key_len, enum ha_rkey_function find_flag)
|
|
{
|
|
byte *pos;
|
|
HP_SHARE *share= info->s;
|
|
HP_KEYDEF *keyinfo= share->keydef + inx;
|
|
DBUG_ENTER("heap_rkey");
|
|
DBUG_PRINT("enter",("base: 0x%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 (keyinfo->algorithm == HA_KEY_ALG_BTREE)
|
|
{
|
|
heap_rb_param custom_arg;
|
|
|
|
custom_arg.keyseg= info->s->keydef[inx].seg;
|
|
custom_arg.key_length= info->lastkey_len=
|
|
hp_rb_pack_key(keyinfo, (uchar*) info->lastkey,
|
|
(uchar*) key, key_len);
|
|
custom_arg.search_flag= SEARCH_FIND | SEARCH_SAME;
|
|
/* for next rkey() after deletion */
|
|
if (find_flag == HA_READ_AFTER_KEY)
|
|
info->last_find_flag= HA_READ_KEY_OR_NEXT;
|
|
else if (find_flag == HA_READ_BEFORE_KEY)
|
|
info->last_find_flag= HA_READ_KEY_OR_PREV;
|
|
else
|
|
info->last_find_flag= find_flag;
|
|
if (!(pos= tree_search_key(&keyinfo->rb_tree, info->lastkey, info->parents,
|
|
&info->last_pos, find_flag, &custom_arg)))
|
|
{
|
|
info->update= 0;
|
|
DBUG_RETURN(my_errno= HA_ERR_KEY_NOT_FOUND);
|
|
}
|
|
memcpy(&pos, pos + (*keyinfo->get_key_length)(keyinfo, pos), sizeof(byte*));
|
|
info->current_ptr= pos;
|
|
}
|
|
else
|
|
{
|
|
if (!(pos= hp_search(info, share->keydef + inx, key, 0)))
|
|
{
|
|
info->update= 0;
|
|
DBUG_RETURN(my_errno);
|
|
}
|
|
if (!(keyinfo->flag & HA_NOSAME) || (keyinfo->flag & HA_END_SPACE_KEY))
|
|
memcpy(info->lastkey, key, (size_t) keyinfo->length);
|
|
}
|
|
memcpy(record, pos, (size_t) share->reclength);
|
|
info->update= HA_STATE_AKTIV;
|
|
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);
|
|
}
|