← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_insert.cc

  • Committer: Brian Aker
  • Date: 2009-11-17 18:11:45 UTC
  • mto: This revision was merged to the branch mainline in revision 1222.
  • Revision ID: brian@gaz-20091117181145-567c6eg3zdi7572l
Remove mysql_lock_have_duplicate()  (we don't have merge, and our partition
will not require this in the future).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_insert.cc
655
655
  if (!select_insert)
656
656
  {
657
657
    TableList *duplicate;
658
 
    if ((duplicate= unique_table(session, table_list, table_list->next_global, 1)))
 
658
    if ((duplicate= unique_table(table_list, table_list->next_global, true)))
659
659
    {
660
660
      my_error(ER_UPDATE_TABLE_USED, MYF(0), table_list->alias);
661
661
 
1154
1154
    Is table which we are changing used somewhere in other parts of
1155
1155
    query
1156
1156
  */
1157
 
  if (unique_table(session, table_list, table_list->next_global, 0))
 
1157
  if (unique_table(table_list, table_list->next_global))
1158
1158
  {
1159
1159
    /* Using same table for INSERT and SELECT */
1160
1160
    lex->current_select->options|= OPTION_BUFFER_RESULT;