← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/embedded_innodb/embedded_innodb_engine.cc

  • Committer: Monty Taylor
  • Date: 2010-08-12 06:10:25 UTC
  • mto: (1711.1.1 innodb-plugin-merge)
  • mto: This revision was merged to the branch mainline in revision 1712.
  • Revision ID: mordred@inaugust.com-20100812061025-cme620sdil8aov41
Free strdup'd option strings.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/embedded_innodb/embedded_innodb_engine.cc
2742
2742
 
2743
2743
  if (vm.count("data-home-dir"))
2744
2744
  {
2745
 
    innobase_data_home_dir= const_cast<char *>(vm["data-home-dir"].as<string>().c_str());
 
2745
    innobase_data_home_dir= strdup(vm["data-home-dir"].as<string>().c_str());
2746
2746
  }
2747
2747
 
2748
2748
  else
2752
2752
 
2753
2753
  if (vm.count("file-format"))
2754
2754
  {
2755
 
    innobase_file_format_name= const_cast<char *>(vm["file-format"].as<string>().c_str());
 
2755
    innobase_file_format_name= strdup(vm["file-format"].as<string>().c_str());
2756
2756
  }
2757
2757
 
2758
2758
  else
2759
2759
  {
2760
 
    innobase_file_format_name= (char *)"Barracuda";
 
2760
    innobase_file_format_name= strdup("Barracuda");
2761
2761
  }
2762
2762
 
2763
2763
  if (vm.count("log-group-home-dir"))
2764
2764
  {
2765
 
    innobase_log_group_home_dir= const_cast<char *>(vm["log-group-home-dir"].as<string>().c_str());
 
2765
    innobase_log_group_home_dir= strdup(vm["log-group-home-dir"].as<string>().c_str());
2766
2766
  }
2767
2767
 
2768
2768
  else
2772
2772
 
2773
2773
  if (vm.count("flush-method"))
2774
2774
  {
2775
 
    innobase_unix_file_flush_method= const_cast<char *>(vm["flush-method"].as<string>().c_str());
 
2775
    innobase_unix_file_flush_method= strdup(vm["flush-method"].as<string>().c_str());
2776
2776
  }
2777
2777
 
2778
2778
  else
2782
2782
 
2783
2783
  if (vm.count("data-file-path"))
2784
2784
  {
2785
 
    innodb_data_file_path= const_cast<char *>(vm["data-file-path"].as<string>().c_str());
 
2785
    innodb_data_file_path= strdup(vm["data-file-path"].as<string>().c_str());
2786
2786
  }
2787
2787
 
2788
2788
  else
2792
2792
 
2793
2793
  if (vm.count("data-home-dir"))
2794
2794
  {
2795
 
    innobase_data_home_dir= const_cast<char *>(vm["data-home-dir"].as<string>().c_str());
 
2795
    innobase_data_home_dir= strdup(vm["data-home-dir"].as<string>().c_str());
2796
2796
  }
2797
2797
 
2798
2798
  else
2996
2996
  {
2997
2997
    fprintf(stderr,"Error %d shutting down Embedded InnoDB!\n", err);
2998
2998
  }
 
2999
 
 
3000
  /* These get strdup'd from vm variables */
 
3001
  free(innodb_data_file_path);
 
3002
  free(innobase_data_home_dir);
 
3003
  free(innobase_file_format_name);
 
3004
  free(innobase_log_group_home_dir);
 
3005
  free(innobase_unix_file_flush_method);
 
3006
 
2999
3007
}
3000
3008
 
3001
3009
static char innodb_file_format_name_storage[100];