~drizzle-trunk/drizzle/development

Viewing changes to drizzled/db.cc

ALTER DATABASE using NormalisedDatabaseName

added added

removed removed

270

271

/* db-name is already validated when we come here */

272

273

bool mysql_alter_db(Session *session, const char *db, HA_CREATE_INFO *create_info)

273

bool mysql_alter_db(Session *session, const NormalisedDatabaseName &database_name, HA_CREATE_INFO *create_info)

274

{

275

ReplicationServices &replication_services= ReplicationServices::singleton();

276

long result=1;

296

pthread_mutex_lock(&LOCK_create_db);

297

298

/* Change options if current database is being altered. */

299

path_len= build_table_filename(path, sizeof(path), db, "", false);

299

path_len= build_table_filename(path, sizeof(path), database_name.to_string().c_str(), "", false);

300

path[path_len-1]= 0; // Remove last '/' from path

301

302

error= write_schema_file(session, path, db, create_info);

302

error= write_schema_file(session, path, database_name.to_string().c_str(), create_info);

303

if (error && error != EEXIST)

304

{

305

/* TODO: find some witty way of getting back an error message */