← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/row_count.cc

  • Committer: Brian Aker
  • Date: 2011-01-11 20:32:48 UTC
  • mto: This revision was merged to the branch mainline in revision 2075.
  • Revision ID: brian@tangent.org-20110111203248-0kyusqlkqd2xqvs7
Cleanup issue of OR in tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/row_count.cc
28
28
int64_t Item_func_row_count::val_int()
29
29
{
30
30
  assert(fixed == 1);
31
 
  return getSession().rowCount();
 
31
  Session *session= current_session;
 
32
 
 
33
  return session->row_count_func;
32
34
}
33
35
 
34
36