← Back to branch summary

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

« back to all changes in this revision

Viewing changes to plugin/sleep/sleep.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:
plugin/sleep/sleep.cc
32
32
#include <drizzled/internal/my_pthread.h>
33
33
#include <drizzled/function/str/strfunc.h>
34
34
#include <drizzled/plugin/function.h>
 
35
#include <drizzled/item/cmpfunc.h>
35
36
 
36
37
#include <string>
37
38
 
71
72
int64_t Item_func_sleep::val_int()
72
73
{
73
74
  /* int time in seconds, decimal allowed */
74
 
  double dtime;
 
75
  double dtime= args[0]->val_real();
75
76
 
76
77
  Session &session(getSession());
77
78
 
78
 
  if ((arg_count != 1) || ! (dtime= args[0]->val_real()))
 
79
  if ((arg_count != 1) || compare_double(0, dtime))
79
80
  {
80
81
    null_value= true;
81
82
    return 0;