← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_insert.cc

  • Committer: Mark Atwood
  • Date: 2011-08-12 04:08:33 UTC
  • mfrom: (2385.2.17 refactor5)
  • Revision ID: me@mark.atwood.name-20110812040833-u6j85nc6ahuc0dtz
merge lp:~olafvdspek/drizzle/refactor5

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_insert.cc
550
550
     than INSERT.
551
551
  */
552
552
 
553
 
  if (setup_tables_and_check_access(session, &session->lex().select_lex.context,
554
 
                                    &session->lex().select_lex.top_join_list,
555
 
                                    table_list,
556
 
                                    &session->lex().select_lex.leaf_tables,
557
 
                                    select_insert))
558
 
    return true;
559
 
 
560
 
  return false;
 
553
  return setup_tables_and_check_access(session, &session->lex().select_lex.context,
 
554
    &session->lex().select_lex.top_join_list, table_list, &session->lex().select_lex.leaf_tables, select_insert);
561
555
}
562
556
 
563
557
 
633
627
  if (duplic == DUP_UPDATE)
634
628
  {
635
629
    /* it should be allocated before Item::fix_fields() */
636
 
    if (table_list->set_insert_values(session->mem_root))
637
 
      return true;
 
630
    table_list->set_insert_values();
638
631
  }
639
632
 
640
633
  if (prepare_insert_check_table(session, table_list, fields, select_insert))