← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

  • Committer: Brian Aker
  • Date: 2008-10-31 05:09:50 UTC
  • mfrom: (520.4.38 devel)
  • Revision ID: brian@tangent.org-20081031050950-0ujwuqizima69ltr
Merged Monty's work.

Show diffs side-by-side

added added

removed removed

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