mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-09 16:44:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge bk-internal:/home/bk/mysql-4.1/

Browse source 
into serg.mylan:/usr/home/serg/Abk/mysql-4.1


sql/item_strfunc.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
This commit is contained in:
unknown 2004-02-27 22:38:36 +01:00
commit 42f5a91f59
16 changed files with 71 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

2
sql/item_strfunc.cc
View file

@ -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