← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/schema_engine/schema.cc

Merged Drizzle's Trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/schema_engine/schema.cc
46
46
 
47
47
// This should always be the same value as GLOBAL_TEMPORARY_EXT but be
48
48
// CASE_UP. --Brian
49
 
static SchemaIdentifier TEMPORARY_IDENTIFIER("TEMPORARY");
 
49
static SchemaIdentifier TEMPORARY_IDENTIFIER(".TEMPORARY");
50
50
 
51
51
#define MY_DB_OPT_FILE "db.opt"
52
52
#define DEFAULT_FILE_EXTENSION ".dfe" // Deep Fried Elephant
282
282
 
283
283
  if (not db.SerializeToFileDescriptor(fd))
284
284
  {
285
 
    my_error(ER_CORRUPT_TABLE_DEFINITION, MYF(0),
286
 
             db.InitializationErrorString().c_str());
 
285
    my_error(ER_CORRUPT_SCHEMA_DEFINITION, MYF(0), schema_file.c_str(),
 
286
             db.InitializationErrorString().empty() ? "unknown" :  db.InitializationErrorString().c_str());
287
287
 
288
288
    if (close(fd) == -1)
289
289
      perror(schema_file_tmp);
341
341
      return true;
342
342
    }
343
343
 
344
 
    my_error(ER_CORRUPT_TABLE_DEFINITION, MYF(0),
345
 
             schema_message.InitializationErrorString().c_str());
 
344
    my_error(ER_CORRUPT_SCHEMA_DEFINITION, MYF(0), db_opt_path.c_str(),
 
345
             schema_message.InitializationErrorString().empty() ? "unknown" :  schema_message.InitializationErrorString().c_str());
346
346
  }
347
347
  else
348
348
  {