← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_list.cc

Merge with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_list.cc
1
 
/* Copyright (C) 2009 Sun Microsystems
 
1
/* Copyright (C) 2009 Sun Microsystems, Inc.
2
2
 
3
3
  This program is free software; you can redistribute it and/or modify
4
4
  it under the terms of the GNU General Public License as published by
76
76
TableList *TableList::last_leaf_for_name_resolution()
77
77
{
78
78
  TableList *cur_table_ref= this;
79
 
  nested_join_st *cur_nested_join;
 
79
  NestedJoin *cur_nested_join;
80
80
 
81
81
  if (is_leaf_for_name_resolution())
82
82
    return this;
114
114
TableList *TableList::first_leaf_for_name_resolution()
115
115
{
116
116
  TableList *cur_table_ref= NULL;
117
 
  nested_join_st *cur_nested_join;
 
117
  NestedJoin *cur_nested_join;
118
118
 
119
119
  if (is_leaf_for_name_resolution())
120
120
    return this;