← 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-02-22 06:12:02 UTC
  • mfrom: (2190.1.6 drizzle-build)
  • Revision ID: brian@tangent.org-20110222061202-k03czxykqy4x9hjs
List update, header fixes, multiple symbols, and David deletes some code.

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
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
 
34
34
class Item;
35
35
class Item_field;
36
36
 
37
 
uint32_t TableList::create_table_def_key(char *key)
38
 
{
39
 
  return TableIdentifier::createKey(key, db, table_name);
40
 
}
41
 
 
42
37
bool TableList::set_insert_values(memory::Root *)
43
38
{
44
39
  if (table)
81
76
TableList *TableList::last_leaf_for_name_resolution()
82
77
{
83
78
  TableList *cur_table_ref= this;
84
 
  nested_join_st *cur_nested_join;
 
79
  NestedJoin *cur_nested_join;
85
80
 
86
81
  if (is_leaf_for_name_resolution())
87
82
    return this;
99
94
    */
100
95
    if ((cur_table_ref->outer_join & JOIN_TYPE_RIGHT))
101
96
    {
102
 
      List_iterator_fast<TableList> it(cur_nested_join->join_list);
 
97
      List<TableList>::iterator it(cur_nested_join->join_list.begin());
103
98
      TableList *next;
104
99
      cur_table_ref= it++;
105
100
      while ((next= it++))
119
114
TableList *TableList::first_leaf_for_name_resolution()
120
115
{
121
116
  TableList *cur_table_ref= NULL;
122
 
  nested_join_st *cur_nested_join;
 
117
  NestedJoin *cur_nested_join;
123
118
 
124
119
  if (is_leaf_for_name_resolution())
125
120
    return this;
129
124
       cur_nested_join;
130
125
       cur_nested_join= cur_table_ref->nested_join)
131
126
  {
132
 
    List_iterator_fast<TableList> it(cur_nested_join->join_list);
 
127
    List<TableList>::iterator it(cur_nested_join->join_list.begin());
133
128
    cur_table_ref= it++;
134
129
    /*
135
130
      If the current nested join is a RIGHT JOIN, the operands in
170
165
    int type;
171
166
    bool have_empty_use_join= false, have_empty_use_order= false,
172
167
         have_empty_use_group= false;
173
 
    List_iterator <Index_hint> iter(*index_hints);
 
168
    List_iterator <Index_hint> iter(index_hints->begin());
174
169
 
175
170
    /* initialize temporary variables used to collect hints of each kind */
176
171
    for (type= INDEX_HINT_IGNORE; type <= INDEX_HINT_FORCE; type++)
314
309
 
315
310
    if (index_hints)
316
311
    {
317
 
      List_iterator<Index_hint> it(*index_hints);
 
312
      List<Index_hint>::iterator it(index_hints->begin());
318
313
      Index_hint *hint;
319
314
 
320
315
      while ((hint= it++))