← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Stewart Smith
  • Date: 2009-07-02 17:18:18 UTC
  • mfrom: (1085 staging)
  • mto: This revision was merged to the branch mainline in revision 1089.
  • Revision ID: stewart@flamingspork.com-20090702171818-qrp4d403iw8tazlg
merge mainline

Show diffs side-by-side

added added

removed removed

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