← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: Brian Aker
  • Date: 2011-02-18 16:48:57 UTC
  • mfrom: (2180.1.3 drizzle-staging)
  • Revision ID: brian@tangent.org-20110218164857-4n61en8wai9c91gi
Rollup all of Olaf's branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
2146
2146
    */
2147
2147
    if (table_name && table_name[0])
2148
2148
    {
2149
 
      List_iterator<TableList> it(table_list->getNestedJoin()->join_list);
 
2149
      List<TableList>::iterator it(table_list->getNestedJoin()->join_list);
2150
2150
      TableList *table;
2151
2151
      while ((table= it++))
2152
2152
      {
2445
2445
                  find_item_error_report_type report_error,
2446
2446
                  enum_resolution_type *resolution)
2447
2447
{
2448
 
  List_iterator<Item> li(items);
 
2448
  List<Item>::iterator li(items);
2449
2449
  Item **found=0, **found_unaliased= 0, *item;
2450
2450
  const char *db_name=0;
2451
2451
  const char *field_name=0;
2648
2648
static bool
2649
2649
test_if_string_in_list(const char *find, List<String> *str_list)
2650
2650
{
2651
 
  List_iterator<String> str_list_it(*str_list);
 
2651
  List<String>::iterator str_list_it(*str_list);
2652
2652
  String *curr_str;
2653
2653
  size_t find_length= strlen(find);
2654
2654
  while ((curr_str= str_list_it++))
3273
3273
    return 0;
3274
3274
 
3275
3275
  Item *item;
3276
 
  List_iterator<Item> it(fields);
 
3276
  List<Item>::iterator it(fields);
3277
3277
 
3278
3278
  session->lex->current_select->cur_pos_in_select_list= 0;
3279
3279
  while (wild_num && (item= it++))
3334
3334
  register Item *item;
3335
3335
  enum_mark_columns save_mark_used_columns= session->mark_used_columns;
3336
3336
  nesting_map save_allow_sum_func= session->lex->allow_sum_func;
3337
 
  List_iterator<Item> it(fields);
 
3337
  List<Item>::iterator it(fields);
3338
3338
  bool save_is_item_list_lookup;
3339
3339
 
3340
3340
  session->mark_used_columns= mark_used_columns;
3550
3550
 
3551
3551
bool
3552
3552
insert_fields(Session *session, Name_resolution_context *context, const char *db_name,
3553
 
              const char *table_name, List_iterator<Item> *it,
 
3553
              const char *table_name, List<Item>::iterator *it,
3554
3554
              bool )
3555
3555
{
3556
3556
  Field_iterator_table_ref field_iterator;
3824
3824
    field= static_cast<Item_field *>(f++);
3825
3825
    table= field->field->getTable();
3826
3826
    table->auto_increment_field_not_null= false;
3827
 
    f.rewind();
 
3827
    f= fields;
3828
3828
  }
3829
3829
 
3830
3830
  while ((field= static_cast<Item_field *>(f++)))