1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
konstantin@mysql.com 2005-05-13 13:26:08 +02:00
commit e5c916f7e8
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BitKeeper/etc/config
View File

@ -69,6 +69,7 @@ pager:
hours: hours:
[serg:]checkout:get [serg:]checkout:get
[arjen:]checkout:get [arjen:]checkout:get
[kostja:]checkout:get
[nick:]checkout:get [nick:]checkout:get
checkout:edit checkout:edit
eoln:unix eoln:unix

1
BitKeeper/etc/logging_ok
View File

@ -126,6 +126,7 @@ kaa@polly.local
kaj@work.mysql.com kaj@work.mysql.com
kent@mysql.com kent@mysql.com
konstantin@mysql.com konstantin@mysql.com
kosipov@production.mysql.com
kostja@oak.local kostja@oak.local
lars@mysql.com lars@mysql.com
lenz@kallisto.mysql.com lenz@kallisto.mysql.com

2
sql/item_func.cc
View File

@ -1255,8 +1255,8 @@ void Item_func_div::result_precision()
void Item_func_div::fix_length_and_dec() void Item_func_div::fix_length_and_dec()
{ {
DBUG_ENTER("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; prec_increment= current_thd->variables.div_precincrement;
Item_num_op::fix_length_and_dec();
switch(hybrid_type) { switch(hybrid_type) {
case REAL_RESULT: case REAL_RESULT:
{ {