Commit 7911c507 authored by unknown's avatar unknown
Browse files

Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1 

into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-tmp


heap/_check.c:
  Auto merged
heap/hp_create.c:
  Auto merged
include/config-netware.h:
  Auto merged
include/my_base.h:
  Auto merged
include/my_handler.h:
  Auto merged
include/myisam.h:
  Auto merged
innobase/include/Makefile.am:
  Auto merged
myisam/mi_check.c:
  Auto merged
myisam/mi_delete.c:
  Auto merged
myisam/mi_rnext_same.c:
  Auto merged
myisam/mi_search.c:
  Auto merged
myisam/mi_write.c:
  Auto merged
myisam/myisamdef.h:
  Auto merged
myisam/sort.c:
  Auto merged
mysql-test/mysql-test-run.sh:
  Auto merged
mysql-test/r/date_formats.result:
  Auto merged
mysql-test/r/update.result:
  Auto merged
mysql-test/t/date_formats.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
mysql-test/t/update.test:
  Auto merged
mysys/my_getopt.c:
  Auto merged
mysys/my_handler.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/ha_myisam.cc:
  Auto merged
sql/item_timefunc.cc:
  Auto merged
sql/records.cc:
  Auto merged
sql/sql_load.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/structs.h:
  Auto merged
strings/conf_to_src.c:
  Auto merged
strings/ctype-win1250ch.c:
  Auto merged
Makefile.am:
  Merged from 4.1
myisam/myisamchk.c:
  Merged from 4.1
mysql-test/mysql-test-run.pl:
  Merged from 4.1
mysql-test/r/insert_select.result:
  Merged from 4.1
mysql-test/r/myisam.result:
  Merged from 4.1
mysql-test/r/select.result:
  Merged from 4.1
mysql-test/t/insert_select.test:
  Merged from 4.1
mysql-test/t/myisam.test:
  Merged from 4.1
netware/mysql_test_run.c:
  Merged from 4.1
sql/item.cc:
  Merged from 4.1
sql/mysqld.cc:
  Merged from 4.1
sql/sql_update.cc:
  Merged from 4.1
tests/mysql_client_test.c:
  Merged from 4.1
parents 6196a746 987c33a9

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/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,

innobase/btr/makefilewin

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
include ..\include\makefile.i



btr.lib: btr0cur.obj btr0btr.obj btr0pcur.obj btr0sea.obj

	lib -out:..\libs\btr.lib btr0cur.obj btr0btr.obj btr0pcur.obj btr0sea.obj

	

btr0cur.obj: btr0cur.c

	$(CCOM) $(CFL) -c btr0cur.c



btr0btr.obj: btr0btr.c

	$(CCOM) $(CFL) -c btr0btr.c



btr0sea.obj: btr0sea.c

	$(CCOM) $(CFL) -c btr0sea.c



btr0pcur.obj: btr0pcur.c

	$(CCOM) $(CFL) -c btr0pcur.c