← Back to branch summary

~drizzle-trunk/drizzle/jenkins-Drizzle-Builder-203

« back to all changes in this revision

Viewing changes to drizzled/filesort.cc

  • Committer: Continuous Integration
  • Date: 2013-01-08 12:21:05 UTC
  • mfrom: (2611.1.2 drizzle-7.2)
  • Revision ID: ci@drizzle.org-20130108122105-2tvma6orqzbcabrj
Merge lp:~brianaker/drizzle/fix-warnings Build: jenkins-Drizzle-Builder-151

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/filesort.cc
51
51
#include <drizzled/statistics_variables.h>
52
52
#include <drizzled/system_variables.h>
53
53
 
 
54
#include <drizzled/item/cmpfunc.h>
 
55
 
54
56
using namespace std;
55
57
 
56
58
namespace drizzled {
1650
1652
void change_double_for_sort(double nr,unsigned char *to)
1651
1653
{
1652
1654
  unsigned char *tmp=(unsigned char*) to;
1653
 
  if (nr == 0.0)
 
1655
  if (compare_double(nr, 0.0))
1654
1656
  {                                             /* Change to zero string */
1655
1657
    tmp[0]=(unsigned char) 128;
1656
1658
    memset(tmp+1, 0, sizeof(nr)-1);