← 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: 2011-01-24 05:33:52 UTC
  • mto: This revision was merged to the branch mainline in revision 2113.
  • Revision ID: brian@tangent.org-20110124053352-h9682fpb56sd38t9
Cleanup test flags for debug options on server startup

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join.cc
59
59
#include "drizzled/internal/my_sys.h"
60
60
#include "drizzled/internal/iocache.h"
61
61
 
 
62
#include <drizzled/debug.h>
 
63
 
62
64
#include <algorithm>
63
65
 
64
66
using namespace std;
67
69
{
68
70
 
69
71
extern plugin::StorageEngine *heap_engine;
70
 
extern std::bitset<12> test_flags;
71
72
 
72
73
/** Declarations of static functions used in this source file. */
73
74
static bool make_group_fields(Join *main_join, Join *curr_join);
984
985
 
985
986
    tmp_table_param.hidden_field_count= (all_fields.elements -
986
987
           fields_list.elements);
987
 
    Order *tmp_group= ((!simple_group &&
988
 
                           ! (test_flags.test(TEST_NO_KEY_GROUP))) ? group_list :
989
 
                                                                     (Order*) 0);
 
988
    Order *tmp_group= (((not simple_group) or not (getDebug().test(debug::NO_KEY_GROUP))) ? group_list : (Order*) 0);
 
989
 
990
990
    /*
991
991
      Pushing LIMIT to the temporary table creation is not applicable
992
992
      when there is ORDER BY or GROUP BY or there is no GROUP BY, but