← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Brian Aker
  • Date: 2011-02-24 21:32:07 UTC
  • mfrom: (2198.2.5 drizzle-staging)
  • Revision ID: brian@tangent.org-20110224213207-2xoewah42d42hz26
Rollup of BUID, mostly style fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
42
42
#include <drizzled/statement/alter_table.h>
43
43
#include <drizzled/probes.h>
44
44
#include <drizzled/global_charset_info.h>
45
 
 
46
45
#include <drizzled/plugin/logging.h>
47
46
#include <drizzled/plugin/query_rewrite.h>
48
47
#include <drizzled/plugin/query_cache.h>
52
51
#include <drizzled/plugin/event_observer.h>
53
52
#include <drizzled/display.h>
54
53
#include <drizzled/visibility.h>
55
 
 
56
54
#include <drizzled/kill.h>
57
 
 
58
55
#include <drizzled/schema.h>
59
56
 
60
57
#include <limits.h>
1142
1139
  nested_join= ptr->getNestedJoin();
1143
1140
  if (nested_join->join_list.size() == 1)
1144
1141
  {
1145
 
    TableList *embedded= nested_join->join_list.head();
 
1142
    TableList *embedded= &nested_join->join_list.front();
1146
1143
    join_list->pop();
1147
1144
    embedded->setJoinList(join_list);
1148
1145
    embedded->setEmbedding(embedding);