Commit 7fe41df0 authored by holyfoot/hf@hfmain.(none)'s avatar holyfoot/hf@hfmain.(none)
Browse files

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-opt 

into  mysql.com:/home/hf/work/30638/my50-30638
parents 52b35112 9f323e1a

myisam/mi_write.c

+1 −1
Original line number Diff line number Diff line
@@ -975,7 +975,7 @@ int mi_init_bulk_insert(MI_INFO *info, ulong cache_size, ha_rows rows) 
    DBUG_RETURN(0);



  if (rows && rows*total_keylength < cache_size)

    cache_size=rows;

    cache_size= (ulong)rows;

  else

    cache_size/=total_keylength*16;

myisam/sort.c

+2 −2
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ int _create_index_by_sort(MI_SORT_PARAM *info,my_bool no_messages, 
    if ((records < UINT_MAX32) && 

       ((my_off_t) (records + 1) * 

        (sort_length + sizeof(char*)) <= (my_off_t) memavl))

      keys= records+1;

      keys= (uint)records+1;

    else

      do

      {
@@ -349,7 +349,7 @@ pthread_handler_t thr_find_all_keys(void *arg) 
    sort_keys= (uchar **) NULL;



    memavl=       max(sort_param->sortbuff_size, MIN_SORT_MEMORY);

    idx=          sort_param->sort_info->max_records;

    idx=          (uint)sort_param->sort_info->max_records;

    sort_length=  sort_param->key_length;

    maxbuffer=    1;

sql/ha_federated.cc

+2 −2
Original line number Diff line number Diff line
@@ -2562,9 +2562,9 @@ int ha_federated::info(uint flag) 
      data_file_length= records * mean_rec_length;



      if (row[12] != NULL)

        update_time= (ha_rows) my_strtoll10(row[12], (char**) 0, &error);

        update_time= (time_t) my_strtoll10(row[12], (char**) 0, &error);

      if (row[13] != NULL)

        check_time= (ha_rows) my_strtoll10(row[13], (char**) 0, &error);

        check_time= (time_t) my_strtoll10(row[13], (char**) 0, &error);

    }



    /*

sql/ha_heap.cc

+1 −1
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ void ha_heap::update_key_stats() 
      else

      {

        ha_rows hash_buckets= file->s->keydef[i].hash_buckets;

        uint no_records= hash_buckets ? file->s->records/hash_buckets : 2;

        uint no_records= hash_buckets ? (uint) file->s->records/hash_buckets : 2;

        if (no_records < 2)

          no_records= 2;

        key->rec_per_key[key->key_parts-1]= no_records;

sql/ha_innodb.cc

+1 −1
Original line number Diff line number Diff line
@@ -5474,7 +5474,7 @@ ha_innobase::info( 


 				table->key_info[i].rec_per_key[j]=

				  rec_per_key >= ~(ulong) 0 ? ~(ulong) 0 :

				  rec_per_key;

				  (ulong) rec_per_key;

			}



			index = dict_table_get_next_index_noninline(index);