Commit 752a7873 authored by dlenev@mysql.com's avatar dlenev@mysql.com

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into mysql.com:/home/dlenev/src/mysql-5.0-merges
parents ea8adbff 3e8045c6
...@@ -85,7 +85,7 @@ public: ...@@ -85,7 +85,7 @@ public:
{ {
len= DECIMAL_BUFF_LENGTH; len= DECIMAL_BUFF_LENGTH;
buf= buffer; buf= buffer;
#if !defined(DBUG_OFF) #if !defined (HAVE_purify) && !defined(DBUG_OFF)
/* Set buffer to 'random' value to find wrong buffer usage */ /* Set buffer to 'random' value to find wrong buffer usage */
for (uint i= 0; i < DECIMAL_BUFF_LENGTH; i++) for (uint i= 0; i < DECIMAL_BUFF_LENGTH; i++)
buffer[i]= i; buffer[i]= i;
......
...@@ -139,8 +139,12 @@ static const dec1 frac_max[DIG_PER_DEC1-1]={ ...@@ -139,8 +139,12 @@ static const dec1 frac_max[DIG_PER_DEC1-1]={
999900000, 999990000, 999999000, 999900000, 999990000, 999999000,
999999900, 999999990 }; 999999900, 999999990 };
#ifdef HAVE_purify
#define sanity(d) DBUG_ASSERT((d)->len > 0)
#else
#define sanity(d) DBUG_ASSERT((d)->len >0 && ((d)->buf[0] | \ #define sanity(d) DBUG_ASSERT((d)->len >0 && ((d)->buf[0] | \
(d)->buf[(d)->len-1] | 1)) (d)->buf[(d)->len-1] | 1))
#endif
#define FIX_INTG_FRAC_ERROR(len, intg1, frac1, error) \ #define FIX_INTG_FRAC_ERROR(len, intg1, frac1, error) \
do \ do \
......
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