← 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: lbieber
  • Date: 2010-08-06 18:39:36 UTC
  • mfrom: (1689.1.2 build)
  • Revision ID: lbieber@orisndriz03-20100806183936-atutsffaugfow2jc
Merge VJ changes for transaction log testing and Merge Stewart - valgrind fix for one of the embedded_innodb parameters

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/embedded_innodb/embedded_innodb_engine.cc
2801
2801
  format= *static_cast<const char*const*>(save);
2802
2802
 
2803
2803
  /* Format is already set in validate */
2804
 
    strncpy(innodb_file_format_name_storage, format, sizeof(innodb_file_format_name_storage));;
2805
 
    innodb_file_format_name_storage[sizeof(innodb_file_format_name_storage)-1]= 0;
 
2804
  memmove(innodb_file_format_name_storage, format, sizeof(innodb_file_format_name_storage));;
 
2805
  innodb_file_format_name_storage[sizeof(innodb_file_format_name_storage)-1]= 0;
2806
2806
 
2807
2807
  *static_cast<const char**>(var_ptr)= innodb_file_format_name_storage;
2808
2808
}