diff options
| author | konstantin@mysql.com <> | 2005-05-13 13:26:08 +0200 |
|---|---|---|
| committer | konstantin@mysql.com <> | 2005-05-13 13:26:08 +0200 |
| commit | e5c916f7e88b8927dbe2f994f94a08d90fa615d2 (patch) | |
| tree | 6f7d08bd5e3f8bddd1935591e33f15c1ad448d41 | |
| parent | 6e71a81915179b29b084cf2b50e79c483ea596b6 (diff) | |
| parent | 3dbe7fb2ca58fb53ae3335b07d13ec66dd07633d (diff) | |
| download | mariadb-git-e5c916f7e88b8927dbe2f994f94a08d90fa615d2.tar.gz | |
Merge
| -rw-r--r-- | BitKeeper/etc/config | 1 | ||||
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | sql/item_func.cc | 2 |
3 files changed, 3 insertions, 1 deletions
diff --git a/BitKeeper/etc/config b/BitKeeper/etc/config index c609fcdbd49..1ac24031dca 100644 --- a/BitKeeper/etc/config +++ b/BitKeeper/etc/config @@ -69,6 +69,7 @@ pager: hours: [serg:]checkout:get [arjen:]checkout:get +[kostja:]checkout:get [nick:]checkout:get checkout:edit eoln:unix diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 311403f93e6..3f0d0ce05fb 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -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 diff --git a/sql/item_func.cc b/sql/item_func.cc index 3c87b6ef920..db49b7b4ae9 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -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: { |