← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_base.cc

  • Committer: Mark Atwood
  • Date: 2011-10-20 03:54:24 UTC
  • mfrom: (2440.4.3 drizzle-build)
  • Revision ID: me@mark.atwood.name-20111020035424-d01kkb8wjdk5gxxx
merge lp:~brianaker/drizzle/syslog-refactor

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_base.cc
809
809
 
810
810
  /* find a unused table in the open table cache */
811
811
  if (refresh)
 
812
  {
812
813
    *refresh= false;
 
814
  }
813
815
 
814
816
  /* an open table operation needs a lot of the stack space */
815
817
  if (check_stack_overrun(this, STACK_MIN_SIZE_FOR_OPEN, (unsigned char *)&alias))
 
818
  {
816
819
    return NULL;
 
820
  }
817
821
 
818
822
  if (getKilled())
 
823
  {
819
824
    return NULL;
 
825
  }
820
826
 
821
827
  identifier::Table identifier(table_list->getSchemaName(), table_list->getTableName());
822
828
  const identifier::Table::Key &key(identifier.getKey());
3717
3723
    table= field->getTable();
3718
3724
 
3719
3725
    if (field == table->next_number_field)
 
3726
    {
3720
3727
      table->auto_increment_field_not_null= true;
 
3728
    }
3721
3729
 
3722
3730
    if (value->save_in_field(field, 0) < 0)
3723
3731
    {
3748
3756
void kill_drizzle(void)
3749
3757
{
3750
3758
  pthread_kill(signal_thread, SIGTERM);
3751
 
  shutdown_in_progress= 1;                      // Safety if kill didn't work
 
3759
  shutdown_in_progress= true;                   // Safety if kill didn't work
3752
3760
}
3753
3761
 
3754
3762
} /* namespace drizzled */