← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/optimizer/quick_ror_union_select.cc

Merge Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/optimizer/quick_ror_union_select.cc
28
28
#include <algorithm>
29
29
 
30
30
using namespace std;
31
 
using namespace drizzled;
32
31
 
 
32
namespace drizzled
 
33
{
33
34
 
34
35
optimizer::QuickRorUnionSelect::QuickRorUnionSelect(Session *session_param,
35
36
                                                    Table *table)
269
270
  }
270
271
}
271
272
 
 
273
} /* namespace drizzled */