← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/db.cc

Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/db.cc
129
129
  }
130
130
  else // Created !
131
131
  {
132
 
    replication_services.rawStatement(session, session->query);
 
132
    replication_services.createSchema(session, schema_message);
133
133
    session->my_ok(1);
134
134
  }
135
135
 
275
275
    assert(! session->query.empty());
276
276
 
277
277
    ReplicationServices &replication_services= ReplicationServices::singleton();
278
 
    replication_services.rawStatement(session, session->getQueryString());
 
278
    replication_services.dropSchema(session, schema_name);
279
279
    session->clear_error();
280
280
    session->server_status|= SERVER_STATUS_DB_DROPPED;
281
281
    session->my_ok((uint32_t) deleted);
410
410
      }
411
411
    }
412
412
 
413
 
    TableIdentifier identifier(db, table->table_name, table->internal_tmp_table ? INTERNAL_TMP_TABLE : NO_TMP_TABLE);
 
413
    TableIdentifier identifier(db, table->table_name);
414
414
 
415
415
    if (table_type == NULL && not plugin::StorageEngine::doesTableExist(*session, identifier))
416
416
    {
454
454
  error= 0;
455
455
  if (wrong_tables.length())
456
456
  {
457
 
    if (!foreign_key_error)
 
457
    if (not foreign_key_error)
458
458
      my_printf_error(ER_BAD_TABLE_ERROR, ER(ER_BAD_TABLE_ERROR), MYF(0),
459
459
                      wrong_tables.c_ptr());
460
460
    else