Commit ab2389ef authored by unknown's avatar unknown
Browse files

Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 

into  sanja.is.com.ua:/home/bell/mysql/bk/work-owner7-5.0


sql/item.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
parents c1852b12 a397d1f7

heap/_check.c

+2 −2
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static int check_one_rb_key(HP_INFO *info, uint keynr, ulong records, 
  ulong found= 0;

  byte *key, *recpos;

  uint key_length;

  uint not_used;

  uint not_used[2];

  

  if ((key= tree_search_edge(&keydef->rb_tree, info->parents,

			     &info->last_pos, offsetof(TREE_ELEMENT, left))))
@@ -177,7 +177,7 @@ static int check_one_rb_key(HP_INFO *info, uint keynr, ulong records, 
      memcpy(&recpos, key + (*keydef->get_key_length)(keydef,key), sizeof(byte*));

      key_length= hp_rb_make_key(keydef, info->recbuf, recpos, 0);

      if (ha_key_cmp(keydef->seg, (uchar*) info->recbuf, (uchar*) key,

		     key_length, SEARCH_FIND | SEARCH_SAME, &not_used))

		     key_length, SEARCH_FIND | SEARCH_SAME, not_used))

      {

	error= 1;

	DBUG_PRINT("error",("Record in wrong link:  key: %d  Record: 0x%lx\n",

heap/hp_create.c

+2 −2
Original line number Diff line number Diff line
@@ -203,9 +203,9 @@ int heap_create(const char *name, uint keys, HP_KEYDEF *keydef, 


static int keys_compare(heap_rb_param *param, uchar *key1, uchar *key2)

{

  uint not_used;

  uint not_used[2];

  return ha_key_cmp(param->keyseg, key1, key2, param->key_length, 

		    param->search_flag, &not_used);

		    param->search_flag, not_used);

}



static void init_block(HP_BLOCK *block, uint reclength, ulong min_records,

include/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ noinst_HEADERS = config-win.h config-os2.h config-netware.h \ 
			mysys_err.h my_base.h help_start.h help_end.h \

			my_nosys.h my_alarm.h queues.h rijndael.h sha1.h \

			my_aes.h my_tree.h hash.h thr_alarm.h \

			thr_lock.h t_ctype.h violite.h md5.h \

			thr_lock.h t_ctype.h violite.h md5.h base64.h \

			mysql_version.h.in my_handler.h my_time.h decimal.h



# mysql_version.h are generated

include/my_handler.h

+2 −0
Original line number Diff line number Diff line
@@ -88,4 +88,6 @@ 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 */

include/myisam.h

+12 −2
Original line number Diff line number Diff line
@@ -392,7 +392,9 @@ typedef enum 
  /* Treat NULLs as inequal when collecting statistics (default for 4.1/5.0) */

  MI_STATS_METHOD_NULLS_NOT_EQUAL,

  /* Treat NULLs as equal when collecting statistics (like 4.0 did) */

  MI_STATS_METHOD_NULLS_EQUAL

  MI_STATS_METHOD_NULLS_EQUAL,

  /* Ignore NULLs - count only tuples without NULLs in the index components */

  MI_STATS_METHOD_IGNORE_NULLS

} enum_mi_stats_method;



typedef struct st_mi_check_param
@@ -419,7 +421,14 @@ typedef struct st_mi_check_param 
  int tmpfile_createflag;

  myf myf_rw;

  IO_CACHE read_cache;

  

  /* 

    The next two are used to collect statistics, see update_key_parts for

    description.

  */

  ulonglong unique_count[MI_MAX_KEY_SEG+1];

  ulonglong notnull_count[MI_MAX_KEY_SEG+1];

  

  ha_checksum key_crc[MI_MAX_POSSIBLE_KEY];

  ulong rec_per_key_part[MI_MAX_KEY_SEG*MI_MAX_POSSIBLE_KEY];

  void *thd;
@@ -479,7 +488,8 @@ void update_auto_increment_key(MI_CHECK *param, MI_INFO *info, 
			       my_bool repair);

int update_state_info(MI_CHECK *param, MI_INFO *info,uint update);

void update_key_parts(MI_KEYDEF *keyinfo, ulong *rec_per_key_part,

			     ulonglong *unique, ulonglong records);

                      ulonglong *unique, ulonglong *notnull, 

                      ulonglong records);

int filecopy(MI_CHECK *param, File to,File from,my_off_t start,

	     my_off_t length, const char *type);

int movepoint(MI_INFO *info,byte *record,my_off_t oldpos,