← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_select.cc

Merged fix-headers work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_select.cc
40
40
#include <drizzled/cached_item.h>
41
41
#include <drizzled/sql_base.h>
42
42
#include <drizzled/field/blob.h>
 
43
#include <drizzled/check_stack_overrun.h>
 
44
#include <drizzled/lock.h>
43
45
 
44
46
#include CMATH_H
45
47
 
2678
2680
    }
2679
2681
  }
2680
2682
 
2681
 
  /* dump_TableList_graph(select_lex, select_lex->leaf_tables); */
2682
2683
  if (join->flatten_subqueries())
2683
2684
  {
2684
2685
    err= 1;
2685
2686
    goto err;
2686
2687
  }
2687
 
  /* dump_TableList_struct(select_lex, select_lex->leaf_tables); */
2688
2688
 
2689
2689
  if ((err= join->optimize()))
2690
2690
  {
3091
3091
      (*in_subq)->is_correlated * MAX_TABLES + child_join->outer_tables;
3092
3092
  }
3093
3093
 
3094
 
  //dump_TableList_struct(select_lex, select_lex->leaf_tables);
3095
3094
  /*
3096
3095
    2. Pick which subqueries to convert:
3097
3096
      sort the subquery array