← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/alter_table.cc

  • Committer: Brian Aker
  • Date: 2010-12-11 17:34:45 UTC
  • mto: (1999.2.1 compare)
  • mto: This revision was merged to the branch mainline in revision 2001.
  • Revision ID: brian@tangent.org-20101211173445-prh4cyiqs99zxtra
Update code for testing identifiers/table/schema name correctness.

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
 
  {
138
137
    return true;
139
 
  }
140
138
 
141
139
  /* ALTER TABLE ends previous transaction */
142
140
  if (not session->endActiveTransaction())
143
 
  {
144
141
    return true;
145
 
  }
146
142
 
147
143
  if (not (need_start_waiting= not session->wait_if_global_read_lock(0, 1)))
148
 
  {
149
144
    return true;
150
 
  }
151
145
 
152
146
  bool res;
153
147
  if (original_table_message->type() == message::Table::STANDARD )
899
893
  ha_rows copied= 0;
900
894
  ha_rows deleted= 0;
901
895
 
 
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();