← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_update.cc

  • Committer: Brian Aker
  • Date: 2009-11-18 06:11:12 UTC
  • mfrom: (1220.1.10 staging)
  • Revision ID: brian@gaz-20091118061112-tyf4qrfr5v7i946b
Monty + Brian Merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_update.cc
63
63
    Get the number of the offended index.
64
64
    We will see MAX_KEY if the engine cannot determine the affected index.
65
65
  */
66
 
  if ((keynr= table->cursor->get_dup_key(error)) >= MAX_KEY)
 
66
  if ((keynr= table->get_dup_key(error)) >= MAX_KEY)
67
67
    return;
68
68
 
69
69
  /* Create unique_map with all fields used by that index. */
516
516
            flags|= ME_FATALERROR; /* Other handler errors are fatal */
517
517
 
518
518
          prepare_record_for_error_message(error, table);
519
 
          table->cursor->print_error(error,MYF(flags));
 
519
          table->print_error(error,MYF(flags));
520
520
          error= 1;
521
521
          break;
522
522
        }
544
544
              are ignored. This is a requirement on batching handlers.
545
545
            */
546
546
            prepare_record_for_error_message(error, table);
547
 
            table->cursor->print_error(error,MYF(0));
 
547
            table->print_error(error,MYF(0));
548
548
            error= 1;
549
549
            break;
550
550
          }
593
593
    */
594
594
  {
595
595
    prepare_record_for_error_message(loc_error, table);
596
 
    table->cursor->print_error(loc_error,MYF(ME_FATALERROR));
 
596
    table->print_error(loc_error,MYF(ME_FATALERROR));
597
597
    error= 1;
598
598
  }
599
599
  else