← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/row_count.cc

Merge Monty - Added inter-plugin dependencies for controlling plugin load order

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/row_count.cc
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include <config.h>
 
20
#include "config.h"
21
21
 
22
22
#include <drizzled/function/row_count.h>
23
23
#include <drizzled/session.h>
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