mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 19:11:46 +01:00
99c431db92
Manually imported changes done to MyISAM (include/myisam.h, storage/myisam/*, sql/ha_myisam.*, mysql-test/t/myisam.test, mysql-test/t/ps_2myisam.test) the last months into Maria (tedious, should do it more frequently in the future), including those not done at the previous 5.1->Maria merge (please in the future don't forget to apply MyISAM changes to Maria when you merge 5.1 into Maria). Note: I didn't try to import anything which could be MyISAM-related in other tests of mysql-test (I didn't want to dig in all csets), but as QA is working to make most tests re-usable for other engines (Falcon), it is likely that we'll benefit from this and just have to set engine=Maria somewhere to run those tests on Maria. func_group and partition tests fail but they already do in main 5.1 on my machine. No Valgrind error in t/*maria*.test. Monty: please see the commit comment of maria.result and check. BitKeeper/deleted/.del-ha_maria.m4: Delete: config/ac-macros/ha_maria.m4 configure.in: fix for the new way of enabling engines include/maria.h: importing changes done to MyISAM the last months into Maria include/my_handler.h: importing changes done to MyISAM the last months into Maria include/myisam.h: importing changes done to MyISAM the last months into Maria mysql-test/r/maria.result: identical to myisam.result, except the engine name in some places AND in the line testing key_block_size=1000000000000000000: Maria gives a key block size of 8192 while MyISAM gives 4096; is it explainable by the difference between MARIA_KEY_BLOCK_LENGTH and the same constant in MyISAM? Monty? mysql-test/r/ps_maria.result: identical to ps_2myisam.result (except the engine name in some places) mysql-test/t/maria.test: instead of engine=maria everywhere, I use @@storage_engine (reduces the diff with myisam.test). importing changes done to MyISAM the last months into Maria mysys/my_handler.c: importing changes done to MyISAM the last months into Maria sql/ha_maria.cc: importing changes done to MyISAM the last months into Maria sql/ha_maria.h: importing changes done to MyISAM the last months into Maria sql/mysqld.cc: unneeded storage/maria/Makefile.am: importing changes done to MyISAM the last months into Maria storage/maria/ma_check.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_create.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_delete_table.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_dynrec.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_extra.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_ft_boolean_search.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_ft_eval.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_ft_nlq_search.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_ft_parser.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_ft_test1.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_ft_update.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_ftdefs.h: importing changes done to MyISAM the last months into Maria storage/maria/ma_key.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_open.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_page.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_rkey.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_rsamepos.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_rt_index.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_rt_mbr.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_search.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_sort.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_test1.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_test2.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_test3.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_update.c: importing changes done to MyISAM the last months into Maria storage/maria/ma_write.c: importing changes done to MyISAM the last months into Maria storage/maria/maria_chk.c: importing changes done to MyISAM the last months into Maria storage/maria/maria_def.h: importing changes done to MyISAM the last months into Maria storage/maria/maria_ftdump.c: importing changes done to MyISAM the last months into Maria storage/maria/maria_pack.c: importing changes done to MyISAM the last months into Maria
112 lines
4 KiB
C
112 lines
4 KiB
C
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
This library 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with this library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
|
|
MA 02111-1307, USA */
|
|
|
|
#ifndef _my_handler_h
|
|
#define _my_handler_h
|
|
|
|
#include "myisampack.h"
|
|
|
|
/*
|
|
There is a hard limit for the maximum number of keys as there are only
|
|
8 bits in the index file header for the number of keys in a table.
|
|
This means that 0..255 keys can exist for a table. The idea of
|
|
HA_MAX_POSSIBLE_KEY is to ensure that one can use myisamchk & tools on
|
|
a MyISAM table for which one has more keys than MyISAM is normally
|
|
compiled for. If you don't have this, you will get a core dump when
|
|
running myisamchk compiled for 128 keys on a table with 255 keys.
|
|
*/
|
|
|
|
#define HA_MAX_POSSIBLE_KEY 255 /* For myisamchk */
|
|
/*
|
|
The following defines can be increased if necessary.
|
|
But beware the dependency of HA_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
|
|
*/
|
|
|
|
#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */
|
|
#define HA_MAX_KEY_SEG 16 /* Max segments for key */
|
|
|
|
#define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6)
|
|
#define HA_MAX_KEY_BUFF (HA_MAX_KEY_LENGTH+HA_MAX_KEY_SEG*6+8+8)
|
|
|
|
typedef struct st_HA_KEYSEG /* Key-portion */
|
|
{
|
|
CHARSET_INFO *charset;
|
|
uint32 start; /* Start of key in record */
|
|
uint32 null_pos; /* position to NULL indicator */
|
|
uint16 bit_pos; /* Position to bit part */
|
|
uint16 flag;
|
|
uint16 length; /* Keylength */
|
|
uint8 type; /* Type of key (for sort) */
|
|
uint8 language;
|
|
uint8 null_bit; /* bitmask to test for NULL */
|
|
uint8 bit_start,bit_end; /* if bit field */
|
|
uint8 bit_length; /* Length of bit part */
|
|
} HA_KEYSEG;
|
|
|
|
#define get_key_length(length,key) \
|
|
{ if ((uchar) *(key) != 255) \
|
|
length= (uint) (uchar) *((key)++); \
|
|
else \
|
|
{ length=mi_uint2korr((key)+1); (key)+=3; } \
|
|
}
|
|
|
|
#define get_key_length_rdonly(length,key) \
|
|
{ if ((uchar) *(key) != 255) \
|
|
length= ((uint) (uchar) *((key))); \
|
|
else \
|
|
{ length=mi_uint2korr((key)+1); } \
|
|
}
|
|
|
|
#define get_key_pack_length(length,length_pack,key) \
|
|
{ if ((uchar) *(key) != 255) \
|
|
{ length= (uint) (uchar) *((key)++); length_pack=1; }\
|
|
else \
|
|
{ length=mi_uint2korr((key)+1); (key)+=3; length_pack=3; } \
|
|
}
|
|
|
|
#define store_key_length_inc(key,length) \
|
|
{ if ((length) < 255) \
|
|
{ *(key)++=(length); } \
|
|
else \
|
|
{ *(key)=255; mi_int2store((key)+1,(length)); (key)+=3; } \
|
|
}
|
|
|
|
#define get_rec_bits(bit_ptr, bit_ofs, bit_len) \
|
|
(((((uint16) (bit_ptr)[1] << 8) | (uint16) (bit_ptr)[0]) >> (bit_ofs)) & \
|
|
((1 << (bit_len)) - 1))
|
|
|
|
#define set_rec_bits(bits, bit_ptr, bit_ofs, bit_len) \
|
|
{ \
|
|
(bit_ptr)[0]= ((bit_ptr)[0] & ~(((1 << (bit_len)) - 1) << (bit_ofs))) | \
|
|
((bits) << (bit_ofs)); \
|
|
if ((bit_ofs) + (bit_len) > 8) \
|
|
(bit_ptr)[1]= ((bit_ptr)[1] & ~((1 << ((bit_len) - 8 + (bit_ofs))) - 1)) | \
|
|
((bits) >> (8 - (bit_ofs))); \
|
|
}
|
|
|
|
#define clr_rec_bits(bit_ptr, bit_ofs, bit_len) \
|
|
set_rec_bits(0, bit_ptr, bit_ofs, bit_len)
|
|
|
|
extern int ha_compare_text(CHARSET_INFO *, uchar *, uint, uchar *, uint ,
|
|
my_bool, my_bool);
|
|
extern int ha_key_cmp(register HA_KEYSEG *keyseg, register uchar *a,
|
|
register uchar *b, uint key_length, uint nextflag,
|
|
uint *diff_pos);
|
|
|
|
extern HA_KEYSEG *ha_find_null(HA_KEYSEG *keyseg, uchar *a);
|
|
|
|
#endif /* _my_handler_h */
|