diff options
| author | unknown <holyfoot/hf@deer.(none)> | 2006-11-06 11:01:35 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@deer.(none)> | 2006-11-06 11:01:35 +0400 |
| commit | 1142adc1ce5a89716190c3187856c24204c1bb20 (patch) | |
| tree | 272bc6e990d3ef308892c731113336527092a69d /strings | |
| parent | 9852dfbcf5d3bfb5eec4316977b3d0d37761520e (diff) | |
| parent | f00e6bd75d24e311016cd72449ed678c0172f6e6 (diff) | |
| download | mariadb-git-1142adc1ce5a89716190c3187856c24204c1bb20.tar.gz | |
Merge mysql.com:/home/hf/work/8663/my50-8663
into mysql.com:/home/hf/work/8663/my51-8663
sql/item_func.cc:
Auto merged
strings/decimal.c:
Auto merged
mysql-test/r/type_newdecimal.result:
merging
mysql-test/t/type_newdecimal.test:
merging
Diffstat (limited to 'strings')
| -rw-r--r-- | strings/decimal.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/strings/decimal.c b/strings/decimal.c index 4ff2b5a693a..2eea721af36 100644 --- a/strings/decimal.c +++ b/strings/decimal.c @@ -1042,7 +1042,7 @@ int decimal2ulonglong(decimal_t *from, ulonglong *to) x=x*DIG_BASE + *buf++; if (unlikely(y > ((ulonglong) ULONGLONG_MAX/DIG_BASE) || x < y)) { - *to=y; + *to=ULONGLONG_MAX; return E_DEC_OVERFLOW; } } |