diff options
| author | unknown <serg@serg.mylan> | 2004-02-27 22:38:36 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-02-27 22:38:36 +0100 |
| commit | 42f5a91f59cf1573b9261707e71f5243f25f45b8 (patch) | |
| tree | 49d558f2add84f7ce839dd5f58b0beff423497f9 /sql/item_strfunc.cc | |
| parent | d6b01aa546fafaabb5df542dacd92aa0ffbf39ed (diff) | |
| parent | fc94a719f05126f7f58248da81d20b8b9db45ccc (diff) | |
| download | mariadb-git-42f5a91f59cf1573b9261707e71f5243f25f45b8.tar.gz | |
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
sql/item_strfunc.cc:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'sql/item_strfunc.cc')
| -rw-r--r-- | sql/item_strfunc.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc index 71754255573..33512eae2cb 100644 --- a/sql/item_strfunc.cc +++ b/sql/item_strfunc.cc @@ -1599,10 +1599,8 @@ String *Item_func_format::val_str(String *str) dec= decimals ? decimals+1 : 0; /* Here default_charset() is right as this is not an automatic conversion */ str->set(nr,decimals, default_charset()); -#ifdef HAVE_ISNAN if (isnan(nr)) return str; -#endif str_length=str->length(); if (nr < 0) str_length--; // Don't count sign |