Commit e53f3aac authored by unknown's avatar unknown
Browse files

Merge pilot.mysql.com:/home/msvensson/mysql/mysql-5.0 

into  pilot.mysql.com:/home/msvensson/mysql/mysql-5.0-maint


mysys/my_read.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
sql/field.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
parents e4fefc40 7118b2c3

configure.in

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ AC_INIT(sql/mysqld.cc) 
AC_CANONICAL_SYSTEM

# The Docs Makefile.am parses this line!

# remember to also change ndb version below and update version.c in ndb

AM_INIT_AUTOMAKE(mysql, 5.0.34)

AM_INIT_AUTOMAKE(mysql, 5.0.36)

AM_CONFIG_HEADER(config.h)



PROTOCOL_VERSION=10
@@ -19,7 +19,7 @@ SHARED_LIB_VERSION=$SHARED_LIB_MAJOR_VERSION:0:0 
# ndb version

NDB_VERSION_MAJOR=5

NDB_VERSION_MINOR=0

NDB_VERSION_BUILD=34

NDB_VERSION_BUILD=36

NDB_VERSION_STATUS=""



# Set all version vars based on $VERSION. How do we do this more elegant ?

heap/hp_block.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ int hp_get_new_block(HP_BLOCK *block, ulong *alloc_length) 
    and my_default_record_cache_size we get about 1/128 unused memory.

   */

  *alloc_length=sizeof(HP_PTRS)*i+block->records_in_block* block->recbuffer;

  if (!(root=(HP_PTRS*) my_malloc(*alloc_length,MYF(0))))

  if (!(root=(HP_PTRS*) my_malloc(*alloc_length,MYF(MY_WME))))

    return 1;



  if (i == 0)

heap/hp_write.c

+9 −3
Original line number Diff line number Diff line
@@ -67,11 +67,17 @@ int heap_write(HP_INFO *info, const byte *record) 
  DBUG_RETURN(0);



err:

  DBUG_PRINT("info",("Duplicate key: %d", (int) (keydef - share->keydef)));

  if (my_errno == HA_ERR_FOUND_DUPP_KEY)

    DBUG_PRINT("info",("Duplicate key: %d", keydef - share->keydef));

  info->errkey= keydef - share->keydef;

  if (keydef->algorithm == HA_KEY_ALG_BTREE)

  /*

    We don't need to delete non-inserted key from rb-tree.  Also, if

    we got ENOMEM, the key wasn't inserted, so don't try to delete it

    either.  Otherwise for HASH index on HA_ERR_FOUND_DUPP_KEY the key

    was inserted and we have to delete it.

  */

  if (keydef->algorithm == HA_KEY_ALG_BTREE || my_errno == ENOMEM)

  {

    /* we don't need to delete non-inserted key from rb-tree */

    keydef--;

  }

  while (keydef >= share->keydef)

innobase/buf/buf0buf.c

+1 −1
Original line number Diff line number Diff line
@@ -649,7 +649,7 @@ buf_pool_init( 
		}

	}



	buf_pool->page_hash = hash0_create(2 * max_size);

	buf_pool->page_hash = hash_create(2 * max_size);



	buf_pool->n_pend_reads = 0;

innobase/dict/dict0dict.c

+3 −3
Original line number Diff line number Diff line
@@ -708,13 +708,13 @@ dict_init(void) 
	mutex_create(&(dict_sys->mutex));

	mutex_set_level(&(dict_sys->mutex), SYNC_DICT);



	dict_sys->table_hash = hash0_create(buf_pool_get_max_size() /

	dict_sys->table_hash = hash_create(buf_pool_get_max_size() /

					(DICT_POOL_PER_TABLE_HASH *

					UNIV_WORD_SIZE));

	dict_sys->table_id_hash = hash0_create(buf_pool_get_max_size() /

	dict_sys->table_id_hash = hash_create(buf_pool_get_max_size() /

					(DICT_POOL_PER_TABLE_HASH *

					UNIV_WORD_SIZE));

	dict_sys->col_hash = hash0_create(buf_pool_get_max_size() /

	dict_sys->col_hash = hash_create(buf_pool_get_max_size() /

					(DICT_POOL_PER_COL_HASH *

					UNIV_WORD_SIZE));

	dict_sys->size = 0;