mysql-5.5.18 merge

1 files changed, 1 insertions, 7 deletions

diff --git a/sql/my_decimal.h b/sql/my_decimal.h
index 3a309209b90..e0c47029940 100644
--- a/sql/my_decimal.h
+++ b/sql/my_decimal.h
@@ -99,12 +99,8 @@ public:
   {
     len= DECIMAL_BUFF_LENGTH;
     buf= buffer;
-#if !defined (HAVE_valgrind) && !defined(DBUG_OFF)
-    /* Set buffer to 'random' value to find wrong buffer usage */
-    for (uint i= 0; i < DECIMAL_BUFF_LENGTH; i++)
-      buffer[i]= i;
-#endif
   }
+
   my_decimal()
   {
     init();
@@ -119,8 +115,6 @@ public:
   void swap(my_decimal &rhs)
   {
     swap_variables(my_decimal, *this, rhs);
-    /* Swap the buffer pointers back */
-    swap_variables(decimal_digit_t *, buf, rhs.buf);
   }
 };