← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/storage_engine.cc

  • Committer: Brian Aker
  • Date: 2010-06-07 06:04:12 UTC
  • mfrom: (1578.6.12 explain-drizzle)
  • Revision ID: brian@gaz-20100607060412-zcz5033ji1m9sqh9
Rollup patch. Mainly has current_session removed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/storage_engine.cc
823
823
    {
824
824
      const char *err_msg= ER(ER_DUP_ENTRY_WITH_KEY_NAME);
825
825
 
826
 
      if (key_nr == 0 &&
827
 
          (table->key_info[0].key_part[0].field->flags &
828
 
           AUTO_INCREMENT_FLAG)
829
 
          && (current_session)->lex->sql_command == SQLCOM_ALTER_TABLE)
830
 
      {
831
 
        err_msg= ER(ER_DUP_ENTRY_AUTOINCREMENT_CASE);
832
 
      }
833
 
 
834
826
      print_keydup_error(key_nr, err_msg, *table);
 
827
 
835
828
      return;
836
829
    }
837
830
    textno=ER_DUP_KEY;