Commit 5e8515d9 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jimw/my/mysql-4.1-14009 

into  mysql.com:/home/jimw/my/mysql-4.1-clean


sql/item_func.cc:
  Auto merged
parents 47b044f4 987c33a9

Makefile.am

+10 −17
Original line number Diff line number Diff line
@@ -97,25 +97,18 @@ tags: 
	support-files/build-tags

.PHONY:		init-db bin-dist



# Test installation. Ports are configurable from the environment.



MYSQL_TEST_MANAGER_PORT =	9305

MYSQL_TEST_MASTER_PORT =	9306

MYSQL_TEST_SLAVE_PORT =		9308

MYSQL_TEST_NDB_PORT =		9350

# Target 'test' will run the regression test suite using the built server.

#

# If you are running in a shared environment, users can avoid clashing

# port numbers by setting individual small numbers 1-100 to the

# environment variable MTR_BUILD_THREAD. The script "mysql-test-run"

# will then calculate the various port numbers it needs from this,

# making sure each user use different ports.



test:

	cd mysql-test ; \

	./mysql-test-run \

		--manager-port=$(MYSQL_TEST_MANAGER_PORT) \

		--master_port=$(MYSQL_TEST_MASTER_PORT) \

		--slave_port=$(MYSQL_TEST_SLAVE_PORT) \

		--ndbcluster_port=$(MYSQL_TEST_NDB_PORT) && \

	./mysql-test-run --ps-protocol \

		--manager-port=$(MYSQL_TEST_MANAGER_PORT) \

		--master_port=$(MYSQL_TEST_MASTER_PORT) \

		--slave_port=$(MYSQL_TEST_SLAVE_PORT) \

		--ndbcluster_port=$(MYSQL_TEST_NDB_PORT)

	./mysql-test-run && \

	./mysql-test-run --ps-protocol



test-force:

	cd mysql-test; \

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: %lx\n",

heap/hp_create.c

+2 −2
Original line number Diff line number Diff line
@@ -170,9 +170,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
@@ -63,4 +63,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
@@ -322,7 +322,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
@@ -349,7 +351,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;
@@ -409,7 +418,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,