Commit 7eefd9d6 authored by unknown's avatar unknown
Browse files

Merge bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/my/mysql-5.0
parents 8cb6031d 7a43b4c6

sql/ha_innodb.cc

+5 −0
Original line number Diff line number Diff line
@@ -336,6 +336,11 @@ innobase_release_temporary_latches( 
/*===============================*/

        THD *thd)

{

	if (!innodb_inited) {

		

		return;

	}



  trx_t *trx= (trx_t*) thd->ha_data[innobase_hton.slot];

  if (trx)

        innobase_release_stat_resources(trx);

sql/item_sum.cc

+2 −1
Original line number Diff line number Diff line
@@ -656,7 +656,8 @@ my_decimal *Item_sum_sum_distinct::val_decimal(my_decimal *fake) 
  else

  {

    double real= val_real();

    double2my_decimal(E_DEC_FATAL_ERROR, real, dec_buffs + curr_dec_buff);

    curr_dec_buff= 0;

    double2my_decimal(E_DEC_FATAL_ERROR, real, dec_buffs);

  }

  return(dec_buffs + curr_dec_buff);

}