← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/min_max.cc

  • Committer: Mark Atwood
  • Date: 2011-05-13 18:04:43 UTC
  • mfrom: (2297.2.3 drizzle-ga)
  • Revision ID: me@mark.atwood.name-20110513180443-qeuvd6tqajgy3ww6
merge lp:~brianaker/drizzle/func-no-session

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/min_max.cc
55
55
    agg_arg_charsets(collation, args, arg_count, MY_COLL_CMP_CONV, 1);
56
56
    if (datetime_found)
57
57
    {
58
 
      session= getSessionPtr();
59
58
      compare_as_dates= true;
60
59
    }
61
60
  }
93
92
  {
94
93
    Item **arg= args + i;
95
94
    bool is_null_unused;
96
 
    uint64_t res= get_datetime_value(session, &arg, 0, datetime_item,
 
95
    uint64_t res= get_datetime_value(&getSession(), &arg, 0, datetime_item,
97
96
                                     &is_null_unused);
98
97
 
99
98
    /* Check if we need to stop (because of error or KILL)  and stop the loop */
100
 
    if (session->is_error())
 
99
    if (getSession().is_error())
101
100
    {
102
101
      null_value= 1;
103
102
      return 0;