← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_delete.cc

Merged from me.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_delete.cc
140
140
    }
141
141
    if (error != HA_ERR_WRONG_COMMAND)
142
142
    {
143
 
      table->cursor->print_error(error,MYF(0));
 
143
      table->print_error(error,MYF(0));
144
144
      error=0;
145
145
      goto cleanup;
146
146
    }
270
270
      }
271
271
      else
272
272
      {
273
 
        table->cursor->print_error(error,MYF(0));
 
273
        table->print_error(error,MYF(0));
274
274
        /*
275
275
          In < 4.0.14 we set the error number to 0 here, but that
276
276
          was not sensible, because then MySQL would not roll back the
292
292
  if (will_batch && (loc_error= table->cursor->end_bulk_delete()))
293
293
  {
294
294
    if (error != 1)
295
 
      table->cursor->print_error(loc_error,MYF(0));
 
295
      table->print_error(loc_error,MYF(0));
296
296
    error=1;
297
297
  }
298
298
  session->set_proc_info("end");
312
312
 
313
313
    if (error2 && (error2 != HA_ERR_WRONG_COMMAND))
314
314
    {
315
 
      table->cursor->print_error(error2, MYF(0));
 
315
      table->print_error(error2, MYF(0));
316
316
      error= 1;
317
317
    }
318
318
  }
379
379
    return(true);
380
380
  {
381
381
    TableList *duplicate;
382
 
    if ((duplicate= unique_table(session, table_list, table_list->next_global, 0)))
 
382
    if ((duplicate= unique_table(table_list, table_list->next_global)))
383
383
    {
384
384
      my_error(ER_UPDATE_TABLE_USED, MYF(0), table_list->alias);
385
385
      return(true);