← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_parse.cc

  • Committer: Brian Aker
  • Date: 2010-05-15 01:19:45 UTC
  • Revision ID: brian@gaz-20100515011945-uxhf94vi0tzm0vq6
Rename of KEY to KeyInfo

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_parse.cc
195
195
  switch (command) {
196
196
  case COM_INIT_DB:
197
197
  {
198
 
    status_var_increment(session->status_var.com_stat[SQLCOM_CHANGE_DB]);
199
198
    if (packet_length == 0)
200
199
    {
201
200
      my_message(ER_NO_DB_ERROR, ER(ER_NO_DB_ERROR), MYF(0));
254
253
  /* If commit fails, we should be able to reset the OK status. */
255
254
  session->main_da.can_overwrite_status= true;
256
255
  TransactionServices &transaction_services= TransactionServices::singleton();
257
 
  transaction_services.ha_autocommit_or_rollback(session, session->is_error());
 
256
  transaction_services.autocommitOrRollback(session, session->is_error());
258
257
  session->main_da.can_overwrite_status= false;
259
258
 
260
259
  session->transaction.stmt.reset();
315
314
  session->query.clear();
316
315
 
317
316
  session->set_proc_info(NULL);
318
 
  free_root(session->mem_root,MYF(memory::KEEP_PREALLOC));
 
317
  session->mem_root->free_root(MYF(memory::KEEP_PREALLOC));
319
318
 
320
319
  if (DRIZZLE_QUERY_DONE_ENABLED() || DRIZZLE_COMMAND_DONE_ENABLED())
321
320
  {
473
472
    drizzle_reset_errors(session, 0);
474
473
  }
475
474
 
476
 
  status_var_increment(session->status_var.com_stat[lex->sql_command]);
477
 
 
478
475
  assert(session->transaction.stmt.hasModifiedNonTransData() == false);
479
476
 
480
477
  /* now we are ready to execute the statement */
902
899
  {
903
900
    my_casedn_str(files_charset_info, table->db.str);
904
901
 
905
 
    SchemaIdentifier schema_identifier(string(table->db.str, table->db.length));
 
902
    SchemaIdentifier schema_identifier(string(table->db.str));
906
903
    if (not check_db_name(schema_identifier))
907
904
    {
908
905