Merge work:/home/bk/mysql-4.0 (4b39d33c) · Commits · Software / OSDI20 Artifacts / mariadb

include/myisam.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -379,7 +379,6 @@ typedef struct st_mi_sort_param
		my_off_t pos,max_pos,filepos,start_recpos;
		uint key, key_length,real_key_length,sortbuff_size;
		uint maxbuffers, keys, find_length, sort_keys_length;
		uint alloced_rec_buff_length;
		my_bool fix_datafile, master;
		MI_KEYDEF *keyinfo;
		SORT_INFO *sort_info;

+2 −6

Original line number	Diff line number	Diff line
		@@ -841,8 +841,7 @@ int chk_data_link(MI_CHECK param, MI_INFO info,int extend)
		if (info->s->base.blobs)
		{
		if (!(to= mi_alloc_rec_buff(info, block_info.rec_len,
		&info->rec_buff,
		&info->alloced_rec_buff_length)))
		&info->rec_buff)))
		{
		mi_check_print_error(param,"Not enough memory for blob at %s",
		llstr(start_recpos,llbuff));
		@@ -1146,7 +1145,6 @@ int mi_repair(MI_CHECK param, register MI_INFO info,
		goto err;
		info->opt_flag\|=WRITE_CACHE_USED;
		sort_param.rec_buff=info->rec_buff;
		sort_param.alloced_rec_buff_length=info->alloced_rec_buff_length;
		if (!(sort_param.record=(byte*) my_malloc((uint) share->base.pack_reclength,
		MYF(0))))
		{
		@@ -1810,7 +1808,6 @@ int mi_repair_by_sort(MI_CHECK param, register MI_INFO info,
		info->rec_cache.file=info->dfile; /* for sort_delete_record */

		sort_param.rec_buff=info->rec_buff;
		sort_param.alloced_rec_buff_length=info->alloced_rec_buff_length;
		if (!(sort_param.record=(byte*) my_malloc((uint) share->base.pack_reclength,
		MYF(0))))
		{
		@@ -2793,8 +2790,7 @@ static int sort_get_next_record(MI_SORT_PARAM *sort_param)
		if (share->base.blobs)
		{
		if (!(to=mi_alloc_rec_buff(info,block_info.rec_len,
		&(sort_param->rec_buff),
		&(sort_param->alloced_rec_buff_length))))
		&(sort_param->rec_buff))))
		{
		mi_check_print_error(param,"Not enough memory for blob at %s",
		llstr(sort_param->start_recpos,llbuff));

+2 −9

Original line number	Diff line number	Diff line
		@@ -1060,8 +1060,7 @@ int _mi_read_dynamic_record(MI_INFO info, my_off_t filepos, byte buf)
		if (info->s->base.blobs)
		{
		if (!(to=mi_alloc_rec_buff(info, block_info.rec_len,
		&info->rec_buff,
		&info->alloced_rec_buff_length)))
		&info->rec_buff)))
		goto err;
		}
		else
		@@ -1107,12 +1106,8 @@ int _mi_cmp_dynamic_unique(MI_INFO info, MI_UNIQUEDEF def,

		/* Don't let the compare destroy blobs that may be in use */
		rec_buff=info->rec_buff;
		alloced_rec_buff_length=info->alloced_rec_buff_length;
		if (info->s->base.blobs)
		{
		info->rec_buff=0;
		info->alloced_rec_buff_length=0;
		}
		error=_mi_read_dynamic_record(info,pos,old_record);
		if (!error)
		error=mi_unique_comp(def, record, old_record, def->null_are_equal);
		@@ -1120,7 +1115,6 @@ int _mi_cmp_dynamic_unique(MI_INFO info, MI_UNIQUEDEF def,
		{
		my_free(mi_get_rec_buff_ptr(info, info->rec_buff), MYF(MY_ALLOW_ZERO_PTR));
		info->rec_buff=rec_buff;
		info->alloced_rec_buff_length=alloced_rec_buff_length;
		}
		my_afree(old_record);
		DBUG_RETURN(error);
		@@ -1331,8 +1325,7 @@ int _mi_read_rnd_dynamic_record(MI_INFO info, byte buf,
		if (share->base.blobs)
		{
		if (!(to= mi_alloc_rec_buff(info, block_info.rec_len,
		&info->rec_buff,
		&info->alloced_rec_buff_length)))
		&info->rec_buff)))
		goto err;
		}
		else

+1 −2

Original line number	Diff line number	Diff line
		@@ -344,8 +344,7 @@ int mi_extra(MI_INFO info, enum ha_extra_function function, void extra_arg)
		}
		}
		if (share->base.blobs)
		mi_alloc_rec_buff(info, -1, &info->rec_buff,
		&info->alloced_rec_buff_length);
		mi_alloc_rec_buff(info, -1, &info->rec_buff);
		break;
		case HA_EXTRA_NORMAL: /* Theese isn't in use */
		info->quick_mode=0;

+1 −2

Original line number	Diff line number	Diff line
		@@ -251,8 +251,7 @@ static int _mi_put_key_in_record(register MI_INFO *info, uint keynr,
		{
		if (!(blob_ptr=
		mi_alloc_rec_buff(info, info->s->keyinfo[keynr].keylength,
		&info->rec_buff,
		&info->alloced_rec_buff_length)))
		&info->rec_buff)))
		goto err;
		}
		key=(byte*) info->lastkey;