← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

Merged in latest.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
28
28
#include "sj_tmp_table.h"
29
29
 
30
30
#include <mysys/my_bit.h>
31
 
#include <drizzled/drizzled_error_messages.h>
32
 
#include <libdrizzle/gettext.h>
 
31
#include <drizzled/error.h>
 
32
#include <drizzled/gettext.h>
33
33
#include <drizzled/util/test.h>
 
34
#include <drizzled/nested_join.h>
34
35
 
35
36
const char *join_type_str[]={ "UNKNOWN","system","const","eq_ref","ref",
36
37
                              "MAYBE_REF","ALL","range","index",