← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_insert.cc

  • Committer: Lee Bieber
  • Date: 2011-02-21 21:20:44 UTC
  • mfrom: (2187.1.2 build)
  • Revision ID: kalebral@gmail.com-20110221212044-x1j9pmv0230febuz
Merge Brian - getLex() usage and fix for table_name creation during admin commands.
Merge Olaf - Use List::begin() and Use List::iterator instead of List_iterator_fast

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_insert.cc
87
87
  }
88
88
  else
89
89
  {                                             // Part field list
90
 
    Select_Lex *select_lex= &session->lex->select_lex;
 
90
    Select_Lex *select_lex= &session->getLex()->select_lex;
91
91
    Name_resolution_context *context= &select_lex->context;
92
92
    Name_resolution_context_state ctx_state;
93
93
    int res;
282
282
    if (table != NULL)
283
283
      table->cursor->ha_release_auto_increment();
284
284
    if (!joins_freed)
285
 
      free_underlaid_joins(session, &session->lex->select_lex);
 
285
      free_underlaid_joins(session, &session->getLex()->select_lex);
286
286
    session->setAbortOnWarning(false);
287
287
    DRIZZLE_INSERT_DONE(1, 0);
288
288
    return true;
291
291
  /* mysql_prepare_insert set table_list->table if it was not set */
292
292
  table= table_list->table;
293
293
 
294
 
  context= &session->lex->select_lex.context;
 
294
  context= &session->getLex()->select_lex.context;
295
295
  /*
296
296
    These three asserts test the hypothesis that the resetting of the name
297
297
    resolution context below is not necessary at all since the list of local
321
321
      if (table != NULL)
322
322
        table->cursor->ha_release_auto_increment();
323
323
      if (!joins_freed)
324
 
        free_underlaid_joins(session, &session->lex->select_lex);
 
324
        free_underlaid_joins(session, &session->getLex()->select_lex);
325
325
      session->setAbortOnWarning(false);
326
326
      DRIZZLE_INSERT_DONE(1, 0);
327
327
 
332
332
      if (table != NULL)
333
333
        table->cursor->ha_release_auto_increment();
334
334
      if (!joins_freed)
335
 
        free_underlaid_joins(session, &session->lex->select_lex);
 
335
        free_underlaid_joins(session, &session->getLex()->select_lex);
336
336
      session->setAbortOnWarning(false);
337
337
      DRIZZLE_INSERT_DONE(1, 0);
338
338
      return true;
339
339
    }
340
340
  }
341
 
  its= values_list;
 
341
  its= values_list.begin();
342
342
 
343
343
  /* Restore the current context. */
344
344
  ctx_state.restore_state(context, table_list);
424
424
    session->row_count++;
425
425
  }
426
426
 
427
 
  free_underlaid_joins(session, &session->lex->select_lex);
 
427
  free_underlaid_joins(session, &session->getLex()->select_lex);
428
428
  joins_freed= true;
429
429
 
430
430
  /*
484
484
    if (table != NULL)
485
485
      table->cursor->ha_release_auto_increment();
486
486
    if (!joins_freed)
487
 
      free_underlaid_joins(session, &session->lex->select_lex);
 
487
      free_underlaid_joins(session, &session->getLex()->select_lex);
488
488
    session->setAbortOnWarning(false);
489
489
    DRIZZLE_INSERT_DONE(1, 0);
490
490
    return true;
547
547
     than INSERT.
548
548
  */
549
549
 
550
 
  if (setup_tables_and_check_access(session, &session->lex->select_lex.context,
551
 
                                    &session->lex->select_lex.top_join_list,
 
550
  if (setup_tables_and_check_access(session, &session->getLex()->select_lex.context,
 
551
                                    &session->getLex()->select_lex.top_join_list,
552
552
                                    table_list,
553
 
                                    &session->lex->select_lex.leaf_tables,
 
553
                                    &session->getLex()->select_lex.leaf_tables,
554
554
                                    select_insert))
555
555
    return(true);
556
556
 
597
597
                          bool select_insert,
598
598
                          bool check_fields, bool abort_on_warning)
599
599
{
600
 
  Select_Lex *select_lex= &session->lex->select_lex;
 
600
  Select_Lex *select_lex= &session->getLex()->select_lex;
601
601
  Name_resolution_context *context= &select_lex->context;
602
602
  Name_resolution_context_state ctx_state;
603
603
  bool insert_into_view= (0 != 0);
964
964
err:
965
965
  info->last_errno= error;
966
966
  /* current_select is NULL if this is a delayed insert */
967
 
  if (session->lex->current_select)
968
 
    session->lex->current_select->no_error= 0;        // Give error
 
967
  if (session->getLex()->current_select)
 
968
    session->getLex()->current_select->no_error= 0;        // Give error
969
969
  table->print_error(error,MYF(0));
970
970
 
971
971
before_err:
1040
1040
 
1041
1041
bool insert_select_prepare(Session *session)
1042
1042
{
1043
 
  LEX *lex= session->lex;
 
1043
  LEX *lex= session->getLex();
1044
1044
  Select_Lex *select_lex= &lex->select_lex;
1045
1045
 
1046
1046
  /*
1087
1087
int
1088
1088
select_insert::prepare(List<Item> &values, Select_Lex_Unit *u)
1089
1089
{
1090
 
  LEX *lex= session->lex;
1091
1090
  int res;
1092
1091
  table_map map= 0;
1093
 
  Select_Lex *lex_current_select_save= lex->current_select;
 
1092
  Select_Lex *lex_current_select_save= session->getLex()->current_select;
1094
1093
 
1095
1094
 
1096
1095
  unit= u;
1100
1099
    select, LEX::current_select should point to the first select while
1101
1100
    we are fixing fields from insert list.
1102
1101
  */
1103
 
  lex->current_select= &lex->select_lex;
 
1102
  session->getLex()->current_select= &session->getLex()->select_lex;
1104
1103
  res= check_insert_fields(session, table_list, *fields, values,
1105
1104
                           !insert_into_view, &map) ||
1106
1105
       setup_fields(session, 0, values, MARK_COLUMNS_READ, 0, 0);
1116
1115
 
1117
1116
  if (info.handle_duplicates == DUP_UPDATE && !res)
1118
1117
  {
1119
 
    Name_resolution_context *context= &lex->select_lex.context;
 
1118
    Name_resolution_context *context= &session->getLex()->select_lex.context;
1120
1119
    Name_resolution_context_state ctx_state;
1121
1120
 
1122
1121
    /* Save the state of the current name resolution context. */
1134
1133
      We use next_name_resolution_table descructively, so check it first (views?)
1135
1134
    */
1136
1135
    assert (!table_list->next_name_resolution_table);
1137
 
    if (lex->select_lex.group_list.elements == 0 &&
1138
 
        !lex->select_lex.with_sum_func)
 
1136
    if (session->getLex()->select_lex.group_list.elements == 0 and
 
1137
        not session->getLex()->select_lex.with_sum_func)
1139
1138
      /*
1140
1139
        We must make a single context out of the two separate name resolution contexts :
1141
1140
        the INSERT table and the tables in the SELECT part of INSERT ... SELECT.
1160
1159
      while ((item= li++))
1161
1160
      {
1162
1161
        item->transform(&Item::update_value_transformer,
1163
 
                        (unsigned char*)lex->current_select);
 
1162
                        (unsigned char*)session->getLex()->current_select);
1164
1163
      }
1165
1164
    }
1166
1165
 
1168
1167
    ctx_state.restore_state(context, table_list);
1169
1168
  }
1170
1169
 
1171
 
  lex->current_select= lex_current_select_save;
 
1170
  session->getLex()->current_select= lex_current_select_save;
1172
1171
  if (res)
1173
1172
    return(1);
1174
1173
  /*
1184
1183
  if (unique_table(table_list, table_list->next_global))
1185
1184
  {
1186
1185
    /* Using same table for INSERT and SELECT */
1187
 
    lex->current_select->options|= OPTION_BUFFER_RESULT;
1188
 
    lex->current_select->join->select_options|= OPTION_BUFFER_RESULT;
 
1186
    session->getLex()->current_select->options|= OPTION_BUFFER_RESULT;
 
1187
    session->getLex()->current_select->join->select_options|= OPTION_BUFFER_RESULT;
1189
1188
  }
1190
 
  else if (!(lex->current_select->options & OPTION_BUFFER_RESULT))
 
1189
  else if (not (session->getLex()->current_select->options & OPTION_BUFFER_RESULT))
1191
1190
  {
1192
1191
    /*
1193
1192
      We must not yet prepare the result table if it is the same as one of the
1240
1239
 
1241
1240
int select_insert::prepare2(void)
1242
1241
{
1243
 
 
1244
 
  if (session->lex->current_select->options & OPTION_BUFFER_RESULT)
 
1242
  if (session->getLex()->current_select->options & OPTION_BUFFER_RESULT)
1245
1243
    table->cursor->ha_start_bulk_insert((ha_rows) 0);
 
1244
 
1246
1245
  return(0);
1247
1246
}
1248
1247
 
1271
1270
bool select_insert::send_data(List<Item> &values)
1272
1271
{
1273
1272
 
1274
 
  bool error=0;
 
1273
  bool error= false;
1275
1274
 
1276
1275
  if (unit->offset_limit_cnt)
1277
1276
  {                                             // using limit offset,count