← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to server/sql_insert.cc

Removed dead variable, sorted authors file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
server/sql_insert.cc
98
98
    }
99
99
 
100
100
    thd->dup_field= 0;
101
 
    select_lex->no_wrap_view_item= true;
102
101
 
103
102
    /* Save the state of the current name resolution context. */
104
103
    ctx_state.save_state(context, table_list);
113
112
 
114
113
    /* Restore the current context. */
115
114
    ctx_state.restore_state(context, table_list);
116
 
    thd->lex->select_lex.no_wrap_view_item= false;
117
115
 
118
116
    if (res)
119
117
      return -1;
721
719
 
722
720
    if (!res && duplic == DUP_UPDATE)
723
721
    {
724
 
      select_lex->no_wrap_view_item= true;
725
722
      res= check_update_fields(thd, context->table_list, update_fields, &map);
726
 
      select_lex->no_wrap_view_item= false;
727
723
    }
728
724
 
729
725
    /* Restore the current context. */
1197
1193
    table_list->next_local= 0;
1198
1194
    context->resolve_in_table_list_only(table_list);
1199
1195
 
1200
 
    lex->select_lex.no_wrap_view_item= true;
1201
1196
    res= res || check_update_fields(thd, context->table_list,
1202
1197
                                    *info.update_fields, &map);
1203
 
    lex->select_lex.no_wrap_view_item= false;
1204
1198
    /*
1205
1199
      When we are not using GROUP BY and there are no ungrouped aggregate functions 
1206
1200
      we can refer to other tables in the ON DUPLICATE KEY part.