bk commit into 5.0 tree (bell:1.1843)

[sanja]

Below is the list of changes that have just been committed into a local
5.0 repository of bell. When bell 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.1843 05/02/09 11:35:22 bell@stripped +3 -0
  fixed C++ syntax in C code
  fixed end of string detection in string->decimal conversion to avoid false alarm about some string part left unconverted (string can be not null terminated)
  ignore my_decimal.cc in libmysqld directory

  strings/decimal.c
    1.35 05/02/09 11:34:23 bell@stripped +5 -4
    fixed C++ syntax in C code

  sql/my_decimal.cc
    1.2 05/02/09 11:34:23 bell@stripped +1 -1
    fixed end of string detection in string->decimal conversion to avoid false alarm about some string part left unconverted (string can be not null terminated)

  BitKeeper/etc/ignore
    1.189 05/02/09 11:34:23 bell@stripped +1 -0
    Added libmysqld/my_decimal.cc to the ignore list

# 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:	bell
# Host:	sanja.is.com.ua
# Root:	/home/bell/mysql/bk/work-m-5.0

--- 1.1/sql/my_decimal.cc	Wed Feb  9 00:49:37 2005
+++ 1.2/sql/my_decimal.cc	Wed Feb  9 11:34:23 2005
@@ -171,7 +171,7 @@
   }
   my_decimal_set_zero(decimal_value);
   err= string2decimal((char *)from, (decimal *)decimal_value, &end);
-  if (*end && !err)
+  if ((end-from) != length && !err)
     err= E_DEC_TRUNCATED;
   check_result(mask, err);
   return err;

--- 1.188/BitKeeper/etc/ignore	Wed Feb  9 00:49:37 2005
+++ 1.189/BitKeeper/etc/ignore	Wed Feb  9 11:34:23 2005
@@ -1059,3 +1059,4 @@
 client/decimal.c
 client/my_decimal.cc
 client/my_decimal.h
+libmysqld/my_decimal.cc

--- 1.34/strings/decimal.c	Wed Feb  9 00:49:35 2005
+++ 1.35/strings/decimal.c	Wed Feb  9 11:34:23 2005
@@ -686,12 +686,13 @@
   {
     /* need to move digits */
     int d_shift;
+    dec1 *to, *barier;
     if (new_front > 0)
     {
       /* move left */
       d_shift= new_front / DIG_PER_DEC1;
-      dec1 *to= dec->buf + (ROUND_UP(beg + 1) - 1 - d_shift);
-      dec1 *barier= dec->buf + (ROUND_UP(end) - 1 - d_shift);
+      to= dec->buf + (ROUND_UP(beg + 1) - 1 - d_shift);
+      barier= dec->buf + (ROUND_UP(end) - 1 - d_shift);
       DBUG_ASSERT(to >= dec->buf);
       DBUG_ASSERT(barier + d_shift < dec->buf + dec->len);
       for(; to <= barier; to++)
@@ -704,8 +705,8 @@
     {
       /* move right */
       d_shift= (1 - new_front) / DIG_PER_DEC1;
-      dec1 *to= dec->buf + ROUND_UP(end) - 1 + d_shift;
-      dec1 *barier= dec->buf + ROUND_UP(beg + 1) - 1 + d_shift;
+      to= dec->buf + ROUND_UP(end) - 1 + d_shift;
+      barier= dec->buf + ROUND_UP(beg + 1) - 1 + d_shift;
       DBUG_ASSERT(to < dec->buf + dec->len);
       DBUG_ASSERT(barier - d_shift >= dec->buf);
       for(; to >= barier; to--)