← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join.cc

  • Committer: Brian Aker
  • Date: 2009-08-18 07:20:29 UTC
  • mfrom: (1117.1.9 merge)
  • Revision ID: brian@gaz-20090818072029-s9ch5lcmltxwidn7
Merge of Brian

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.cc
990
990
                            select_limit : HA_POS_ERROR;
991
991
 
992
992
    if (!(exec_tmp_table1=
993
 
    create_tmp_table(session, &tmp_table_param, all_fields,
 
993
          create_tmp_table(session, &tmp_table_param, all_fields,
994
994
                           tmp_group,
995
 
         group_list ? 0 : select_distinct,
996
 
         group_list && simple_group,
997
 
         select_options,
 
995
                           group_list ? 0 : select_distinct,
 
996
                           group_list && simple_group,
 
997
                           select_options,
998
998
                           tmp_rows_limit,
999
 
         (char *) "")))
 
999
                           (char *) "")))
1000
1000
    {
1001
1001
      return 1;
1002
1002
    }