← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sj_tmp_table.cc

  • Committer: Nathan Williams
  • Date: 2009-06-24 17:47:02 UTC
  • mto: This revision was merged to the branch mainline in revision 1082.
  • Revision ID: nathanlws@gmail.com-20090624174702-rs66w3tjdnb4jitj
The rest of the files in the drizzled directory were purged of the cmin macro and replace with std::min (except for the definition in globals.h and 1 usage in stacktrace.cc).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sj_tmp_table.cc
22
22
#include <drizzled/session.h>
23
23
#include <drizzled/field/varstring.h>
24
24
 
 
25
#include <algorithm>
 
26
 
 
27
using namespace std;
 
28
 
25
29
/*
26
30
  Create a temporary table to weed out duplicate rowid combinations
27
31
 
256
260
    share->max_rows= ~(ha_rows) 0;
257
261
  else
258
262
    share->max_rows= (ha_rows) (((share->db_type() == heap_engine) ?
259
 
                                 cmin(session->variables.tmp_table_size,
260
 
                                      session->variables.max_heap_table_size) :
 
263
                                 min(session->variables.tmp_table_size,
 
264
                                     session->variables.max_heap_table_size) :
261
265
                                 session->variables.tmp_table_size) /
262
266
                                share->reclength);
263
267
  set_if_bigger(share->max_rows,(ha_rows)1);    // For dummy start options