Skip to content

M
MariaDB
Commit e5c916f7 authored by konstantin@mysql.com's avatar konstantin@mysql.com
Browse files
Options

Merge

parents 6e71a819 3dbe7fb2
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
BitKeeper/etc/config
View file @ e5c916f7
...@@ -69,6 +69,7 @@ pager: ...@@ -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
BitKeeper/etc/logging_ok
View file @ e5c916f7
...@@ -126,6 +126,7 @@ kaa@polly.local ...@@ -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
......
sql/item_func.cc
View file @ e5c916f7
...@@ -1255,8 +1255,8 @@ void Item_func_div::result_precision() ...@@ -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:
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7