bk commit into 5.0 tree (gkodinov:1.2206) BUG#20569

[kgeorge]

Below is the list of changes that have just been committed into a local
5.0 repository of kgeorge. When kgeorge does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-07-07 17:27:11+03:00, gkodinov@stripped +1 -0
  Bug #20569 Garbage in DECIMAL results from some mathematical functions
   * portability fix: moved the macro call after the C declaration

  strings/decimal.c@stripped, 2006-07-07 17:27:03+03:00, gkodinov@stripped +1 -1
    Bug #20569 Garbage in DECIMAL results from some mathematical functions
     * moved the macro call after the C declaration

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	gkodinov
# Host:	macbook.gmz
# Root:	/Users/kgeorge/mysql/work/mysql-5.0-opt

--- 1.69/strings/decimal.c	2006-07-07 17:27:26 +03:00
+++ 1.70/strings/decimal.c	2006-07-07 17:27:26 +03:00
@@ -170,8 +170,8 @@
 #define ADD(to, from1, from2, carry)  /* assume carry <= 1 */           \
         do                                                              \
         {                                                               \
-          DBUG_ASSERT((carry) <= 1);                                    \
           dec1 a=(from1)+(from2)+(carry);                               \
+          DBUG_ASSERT((carry) <= 1);                                    \
           if (((carry)= a >= DIG_BASE)) /* no division here! */         \
             a-=DIG_BASE;                                                \
           (to)=a;                                                       \