← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/handler/ha_innodb.cc

  • Committer: Mark Atwood
  • Date: 2011-07-03 16:14:16 UTC
  • mfrom: (2353.3.1 drizzle)
  • Revision ID: me@mark.atwood.name-20110703161416-qho1b6h299v1w6i6
merge lp:~fallenpegasus/drizzle/fix-cppcheck-redundantIfDelete

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
385
385
        // Throw here?
386
386
      }
387
387
      srv_free_paths_and_sizes();
388
 
      if (internal_innobase_data_file_path)
389
 
        free(internal_innobase_data_file_path);
 
388
      free(internal_innobase_data_file_path);
390
389
    }
391
390
    
392
391
    /* These get strdup'd from vm variables */
2252
2251
 
2253
2252
mem_free_and_error:
2254
2253
    srv_free_paths_and_sizes();
2255
 
    if (internal_innobase_data_file_path)
2256
 
      free(internal_innobase_data_file_path);
 
2254
    free(internal_innobase_data_file_path);
2257
2255
    goto error;
2258
2256
  }
2259
2257
 
7968
7966
/*======================================*/
7969
7967
  char* str)  /*!< in, own: create info string to free */
7970
7968
{
7971
 
  if (str) {
7972
 
    free(str);
7973
 
  }
 
7969
  free(str);
7974
7970
}
7975
7971
 
7976
7972
/*******************************************************************//**