← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_list.cc

  • Committer: Brian Aker
  • Date: 2011-01-12 06:45:23 UTC
  • mto: (2073.1.4 catalogs)
  • mto: This revision was merged to the branch mainline in revision 2080.
  • Revision ID: brian@tangent.org-20110112064523-rqhptaqbph22qmj1
Remove custom error.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_list.cc
13
13
  along with this program; if not, write to the Free Software
14
14
  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
15
15
 
16
 
#include <config.h>
 
16
#include "config.h"
17
17
 
18
18
#include <string>
19
19
 
20
 
#include <drizzled/error.h>
21
 
#include <drizzled/table_list.h>
22
 
#include <drizzled/item.h>
23
 
#include <drizzled/item/field.h>
24
 
#include <drizzled/nested_join.h>
25
 
#include <drizzled/sql_lex.h>
26
 
#include <drizzled/sql_select.h>
27
 
#include <drizzled/strfunc.h>
 
20
#include "drizzled/error.h"
 
21
#include "drizzled/table_list.h"
 
22
#include "drizzled/item.h"
 
23
#include "drizzled/item/field.h"
 
24
#include "drizzled/nested_join.h"
 
25
#include "drizzled/sql_lex.h"
 
26
#include "drizzled/sql_select.h"
 
27
#include "drizzled/strfunc.h"
28
28
 
29
29
using namespace std;
30
30
 
76
76
TableList *TableList::last_leaf_for_name_resolution()
77
77
{
78
78
  TableList *cur_table_ref= this;
79
 
  NestedJoin *cur_nested_join;
 
79
  nested_join_st *cur_nested_join;
80
80
 
81
81
  if (is_leaf_for_name_resolution())
82
82
    return this;
94
94
    */
95
95
    if ((cur_table_ref->outer_join & JOIN_TYPE_RIGHT))
96
96
    {
97
 
      List<TableList>::iterator it(cur_nested_join->join_list.begin());
 
97
      List_iterator_fast<TableList> it(cur_nested_join->join_list);
98
98
      TableList *next;
99
99
      cur_table_ref= it++;
100
100
      while ((next= it++))
114
114
TableList *TableList::first_leaf_for_name_resolution()
115
115
{
116
116
  TableList *cur_table_ref= NULL;
117
 
  NestedJoin *cur_nested_join;
 
117
  nested_join_st *cur_nested_join;
118
118
 
119
119
  if (is_leaf_for_name_resolution())
120
120
    return this;
124
124
       cur_nested_join;
125
125
       cur_nested_join= cur_table_ref->nested_join)
126
126
  {
127
 
    List<TableList>::iterator it(cur_nested_join->join_list.begin());
 
127
    List_iterator_fast<TableList> it(cur_nested_join->join_list);
128
128
    cur_table_ref= it++;
129
129
    /*
130
130
      If the current nested join is a RIGHT JOIN, the operands in
165
165
    int type;
166
166
    bool have_empty_use_join= false, have_empty_use_order= false,
167
167
         have_empty_use_group= false;
168
 
    List_iterator <Index_hint> iter(index_hints->begin());
 
168
    List_iterator <Index_hint> iter(*index_hints);
169
169
 
170
170
    /* initialize temporary variables used to collect hints of each kind */
171
171
    for (type= INDEX_HINT_IGNORE; type <= INDEX_HINT_FORCE; type++)
309
309
 
310
310
    if (index_hints)
311
311
    {
312
 
      List<Index_hint>::iterator it(index_hints->begin());
 
312
      List_iterator<Index_hint> it(*index_hints);
313
313
      Index_hint *hint;
314
314
 
315
315
      while ((hint= it++))