← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Nathan Williams
  • Date: 2009-06-23 21:20:32 UTC
  • mto: This revision was merged to the branch mainline in revision 1082.
  • Revision ID: nathanlws@gmail.com-20090623212032-3hzm3n6jnh3r2b0u
First few changes at converting cmin to std::min.
Small style edits around conversions as well.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
33
33
#include <drizzled/field/double.h>
34
34
#include <string>
35
35
#include <vector>
 
36
#include <algorithm>
36
37
 
37
38
#include <drizzled/unireg.h>
38
39
#include <drizzled/message/table.pb.h>
2780
2781
    share->max_rows= ~(ha_rows) 0;
2781
2782
  else
2782
2783
    share->max_rows= (ha_rows) (((share->db_type() == heap_engine) ?
2783
 
                                 cmin(session->variables.tmp_table_size,
 
2784
                                 min(session->variables.tmp_table_size,
2784
2785
                                     session->variables.max_heap_table_size) :
2785
2786
                                 session->variables.tmp_table_size) /
2786
 
                                 share->reclength);
 
2787
                                 share->reclength);
 
2788
 
2787
2789
  set_if_bigger(share->max_rows,(ha_rows)1);    // For dummy start options
2788
2790
  /*
2789
2791
    Push the LIMIT clause to the temporary table creation, so that we