Merge
This commit is contained in:
commit
e5c916f7e8
@ -69,6 +69,7 @@ pager:
|
||||
hours:
|
||||
[serg:]checkout:get
|
||||
[arjen:]checkout:get
|
||||
[kostja:]checkout:get
|
||||
[nick:]checkout:get
|
||||
checkout:edit
|
||||
eoln:unix
|
||||
|
@ -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
|
||||
|
@ -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:
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user