diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-25 16:46:45 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-25 16:46:45 +0300 |
| commit | 3c11750e363da6e1017d5bc86e9e7e03b2c4e101 (patch) | |
| tree | 3e8e0dbed8da743714f85fb19c404dce34319d8b /sql/sql_string.cc | |
| parent | e2a34cbf706926e10016079a094a2877eb2f4f18 (diff) | |
| parent | be0add42f53b23d8a5e279cb3041a3fc93e375a0 (diff) | |
| download | mariadb-git-3c11750e363da6e1017d5bc86e9e7e03b2c4e101.tar.gz | |
Auto-merge from mysql-next-mr.
Diffstat (limited to 'sql/sql_string.cc')
| -rw-r--r-- | sql/sql_string.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_string.cc b/sql/sql_string.cc index a0ea75a0b0a..40040ab0934 100644 --- a/sql/sql_string.cc +++ b/sql/sql_string.cc @@ -120,7 +120,7 @@ bool String::set_real(double num,uint decimals, CHARSET_INFO *cs) int decpt,sign; char *pos,*to; - VOID(fconvert(num,(int) decimals,&decpt,&sign,buff+1)); + (void) fconvert(num,(int) decimals,&decpt,&sign,buff+1); if (!my_isdigit(&my_charset_latin1, buff[1])) { // Nan or Inf pos=buff+1; |