← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/alter_table.cc

  • Committer: Lee Bieber
  • Date: 2010-12-13 18:43:55 UTC
  • mfrom: (1993.3.2 trunk-bug-686773)
  • mto: This revision was merged to the branch mainline in revision 1994.
  • Revision ID: kalebral@gmail.com-20101213184355-tinkj77bvfwwy6ql
Merge Andrew - fix bug 686773: TableFunction::Generator::push() needs assert

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/alter_table.cc
134
134
  }
135
135
 
136
136
  if (not validateCreateTableOption())
 
137
  {
137
138
    return true;
 
139
  }
138
140
 
139
141
  /* ALTER TABLE ends previous transaction */
140
142
  if (not session->endActiveTransaction())
 
143
  {
141
144
    return true;
 
145
  }
142
146
 
143
147
  if (not (need_start_waiting= not session->wait_if_global_read_lock(0, 1)))
 
148
  {
144
149
    return true;
 
150
  }
145
151
 
146
152
  bool res;
147
153
  if (original_table_message->type() == message::Table::STANDARD )
893
899
  ha_rows copied= 0;
894
900
  ha_rows deleted= 0;
895
901
 
896
 
  if (not original_table_identifier.isValid())
897
 
    return true;
898
 
 
899
 
  if (not new_table_identifier.isValid())
900
 
    return true;
901
 
 
902
902
  session->set_proc_info("init");
903
903
 
904
904
  table->use_all_columns();