← Back to branch summary

~stewart/drizzle/embedded-innodb-configuration-file-format

« back to all changes in this revision

Viewing changes to plugin/embedded_innodb/embedded_innodb_engine.cc

  • Committer: Stewart Smith
  • Date: 2010-05-06 06:54:16 UTC
  • Revision ID: stewart@flamingspork.com-20100506065416-08ki4212vsx0clbq
remove mem leak as well as properly show the default innodb_file_format.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/embedded_innodb/embedded_innodb_engine.cc
2194
2194
{
2195
2195
  ib_err_t err;
2196
2196
 
2197
 
  innobase_file_format_name= strdup("Barracuda");
2198
 
 
2199
2197
  err= ib_init();
2200
2198
  if (err != DB_SUCCESS)
2201
2199
    goto innodb_error;
2246
2244
  if (err != DB_SUCCESS)
2247
2245
    goto innodb_error;
2248
2246
 
2249
 
  err= ib_startup("barracuda");
 
2247
  err= ib_startup(innobase_file_format_name);
2250
2248
  if (err != DB_SUCCESS)
2251
2249
    goto innodb_error;
2252
2250
 
2374
2372
  PLUGIN_VAR_RQCMDARG,
2375
2373
  "File format to use for new tables in .ibd files.",
2376
2374
  innodb_file_format_name_validate,
2377
 
  innodb_file_format_name_update, NULL);
 
2375
  innodb_file_format_name_update, "Barracuda");
2378
2376
 
2379
2377
static DRIZZLE_SYSVAR_STR(data_file_path, innodb_data_file_path,
2380
2378
  PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,