Commit e4b2a04e authored by unknown's avatar unknown
Browse files

Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-4.1 

into mysql.com:/home/mysql_src/mysql-4.1-clean
parents 8d5cfa77 16f3170e

Build-tools/Do-compile

+2 −1
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ if ($opt_stage <= 1) 
  $opt_config_options.= " --with-zlib-dir=bundled" if ($opt_bundled_zlib);

  $opt_config_options.= " --with-client-ldflags=-all-static" if ($opt_static_client);

  $opt_config_options.= " --with-debug" if ($opt_with_debug);

  $opt_config_options.= " --without-ndb-debug" if ($opt_with_debug && $opt_with_cluster);

  $opt_config_options.= " --with-libwrap" if ($opt_libwrap);

  $opt_config_options.= " --with-low-memory" if ($opt_with_low_memory);

  $opt_config_options.= " --with-mysqld-ldflags=-all-static" if ($opt_static_server);

configure.in

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ SHARED_LIB_VERSION=14:0:0 
# ndb version

NDB_VERSION_MAJOR=4

NDB_VERSION_MINOR=1

NDB_VERSION_BUILD=9

NDB_VERSION_BUILD=10

NDB_VERSION_STATUS=""



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

heap/hp_create.c

+4 −3
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ int heap_create(const char *name, uint keys, HP_KEYDEF *keydef, 
    }

    share->min_records= min_records;

    share->max_records= max_records;

    share->max_table_size= create_info->max_table_size;

    share->data_length= share->index_length= 0;

    share->reclength= reclength;

    share->blength= 1;

heap/hp_write.c

+2 −1
Original line number Diff line number Diff line
@@ -143,7 +143,8 @@ static byte *next_free_record_pos(HP_SHARE *info) 
  }

  if (!(block_pos=(info->records % info->block.records_in_block)))

  {

    if (info->records > info->max_records && info->max_records)

    if ((info->records > info->max_records && info->max_records) ||

        (info->data_length + info->index_length >= info->max_table_size))

    {

      my_errno=HA_ERR_RECORD_FILE_FULL;

      DBUG_RETURN(NULL);

include/heap.h

+4 −3
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ typedef struct st_heap_share 
  HP_BLOCK block;

  HP_KEYDEF  *keydef;

  ulong min_records,max_records;	/* Params to open */

  ulong data_length,index_length;

  ulong data_length,index_length,max_table_size;

  uint records;				/* records */

  uint blength;				/* records rounded up to 2^n */

  uint deleted;				/* Deleted records in database */
@@ -185,6 +185,7 @@ typedef struct st_heap_create_info 
{

  uint auto_key;

  uint auto_key_type;

  ulong max_table_size;

  ulonglong auto_increment;

} HP_CREATE_INFO;