mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 20:12:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge chilla.local:/home/mydev/mysql-5.0-axmrg

Browse source 
into  chilla.local:/home/mydev/mysql-5.1-axmrg
This commit is contained in:
istruewing@chilla.local 2006-12-20 20:14:28 +01:00
commit 80b97a6b54
5 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
storage/myisam/mi_packrec.c
View file

@ -179,12 +179,12 @@ my_bool _mi_read_pack_info(MI_INFO *info, pbool fix_keys)
if (share->min_pack_length > 254)
share->base.min_block_length+=2;
DBUG_PRINT("info", ("fixed header length: %u", HEAD_LENGTH));
DBUG_PRINT("info", ("total header length: %u", share->pack.header_length));
DBUG_PRINT("info", ("total header length: %lu", share->pack.header_length));
DBUG_PRINT("info", ("pack file version: %u", share->pack.version));
DBUG_PRINT("info", ("min pack length: %u", share->min_pack_length));
DBUG_PRINT("info", ("max pack length: %u", share->max_pack_length));
DBUG_PRINT("info", ("elements of all trees: %u", elements));
DBUG_PRINT("info", ("distinct values bytes: %u", intervall_length));
DBUG_PRINT("info", ("min pack length: %lu", share->min_pack_length));
DBUG_PRINT("info", ("max pack length: %lu", share->max_pack_length));
DBUG_PRINT("info", ("elements of all trees: %lu", elements));
DBUG_PRINT("info", ("distinct values bytes: %lu", intervall_length));
DBUG_PRINT("info", ("number of code trees: %u", trees));
DBUG_PRINT("info", ("bytes for record lgt: %u", share->pack.ref_length));
DBUG_PRINT("info", ("record pointer length: %u", rec_reflength));
@ -366,7 +366,8 @@ static uint read_huff_table(MI_BIT_BUFF *bit_buff, MI_DECODE_TREE *decode_tree,
}
size=elements*2-2;
DBUG_PRINT("info", ("tree size in uint16: %u", size));
DBUG_PRINT("info", ("tree size in bytes: %u", size * sizeof(uint16)));
DBUG_PRINT("info", ("tree size in bytes: %u",
size * (uint) sizeof(uint16)));
for (end=ptr+size ; ptr < end ; ptr++)
{

1
storage/myisam/mi_range.c
View file

@ -171,6 +171,7 @@ static double _mi_search_pos(register MI_INFO *info,
uchar *keypos,*buff;
double offset;
DBUG_ENTER("_mi_search_pos");
LINT_INIT(max_keynr);
if (pos == HA_OFFSET_ERROR)
DBUG_RETURN(0.5);

2
storage/myisam/mi_test1.c
View file

@ -584,7 +584,7 @@ static struct my_option my_long_options[] =
static my_bool
get_one_option(int optid, const struct my_option *opt __attribute__((unused)),
char *argument)
char *argument __attribute__((unused)))
{
switch(optid) {
case 'a':

1
storage/myisam/mi_write.c
View file

@ -595,6 +595,7 @@ int _mi_split_page(register MI_INFO *info, register MI_KEYDEF *keyinfo,
my_off_t new_pos;
MI_KEY_PARAM s_temp;
DBUG_ENTER("mi_split_page");
LINT_INIT(after_key);
DBUG_DUMP("buff",(byte*) buff,mi_getint(buff));
if (info->s->keyinfo+info->lastinx == keyinfo)

4
storage/myisam/rt_split.c
View file

@ -188,6 +188,10 @@ static int split_rtree_node(SplitStruct *node, int n_entries,
int next_node;
int i;
SplitStruct *end = node + n_entries;
LINT_INIT(a);
LINT_INIT(b);
LINT_INIT(next);
LINT_INIT(next_node);
if (all_size < min_size * 2)
{