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

Merge 


BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted
parents b8b76e22 db416599

BitKeeper/etc/config

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ pager: 
hours: 

[serg:]checkout:get

[arjen:]checkout:get

[kostja:]checkout:get

[nick:]checkout:get

checkout:edit

eoln:unix

BitKeeper/etc/logging_ok

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ kaa@polly.local 
kaj@work.mysql.com

kent@mysql.com

konstantin@mysql.com

kosipov@production.mysql.com

kostja@oak.local

lars@mysql.com

lenz@kallisto.mysql.com

sql/item_func.cc

+1 −1
Original line number Diff line number Diff line
@@ -1255,8 +1255,8 @@ void Item_func_div::result_precision() 
void Item_func_div::fix_length_and_dec()

{

  DBUG_ENTER("Item_func_div::fix_length_and_dec");

  Item_num_op::fix_length_and_dec();

  prec_increment= current_thd->variables.div_precincrement;

  Item_num_op::fix_length_and_dec();

  switch(hybrid_type) {

  case REAL_RESULT:

  {