← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/item_strfunc.cc

  • Committer: Brian Aker
  • Date: 2008-10-26 00:25:23 UTC
  • mfrom: (561.1.2 devel)
  • Revision ID: brian@tangent.org-20081026002523-sadro556f2jj6k98
Committing merge from Monty.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/item_strfunc.cc
25
25
    (This shouldn't be needed)
26
26
*/
27
27
 
 
28
using namespace std;
28
29
#include <drizzled/server_includes.h>
29
30
#include <mysys/sha1.h>
30
31
#include <zlib.h>
1407
1408
    nr= my_double_round(nr, (int64_t) dec, false, false);
1408
1409
    /* Here default_charset() is right as this is not an automatic conversion */
1409
1410
    str->set_real(nr, dec, default_charset());
1410
 
    if (std::isnan(nr))
 
1411
    if (isnan(nr))
1411
1412
      return str;
1412
1413
    str_length=str->length();
1413
1414
    if (nr < 0)