← 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: Lee Bieber
  • Date: 2011-01-10 20:12:43 UTC
  • mfrom: (2069.1.3 build)
  • Revision ID: kalebral@gmail.com-20110110201243-j7xse6v4ptaipc92
Merge Gustaf - Use constrained_check<> classes on kernel sysvars 
Merge Andrew - fix bug 645004: libuuid configure error message needs changing
Merge Stewart - fix bug 698315: innobase tests fail with --repeat=2

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
2008
2008
    }
2009
2009
 
2010
2010
    if (format_id >= 0) {
2011
 
      innobase_file_format_max= 
2012
 
        trx_sys_file_format_id_to_name((uint)format_id);
 
2011
      innobase_file_format_max.assign(
 
2012
                             trx_sys_file_format_id_to_name((uint)format_id));
2013
2013
 
2014
2014
      /* Update the max format id in the system tablespace. */
2015
 
      char name_buff[100];
2016
 
      strcpy(name_buff, innobase_file_format_max.c_str());
2017
 
      if (trx_sys_file_format_max_set(format_id, (const char **)&name_buff))
 
2015
      const char *name_buff;
 
2016
 
 
2017
      if (trx_sys_file_format_max_set(format_id, &name_buff))
2018
2018
      {
2019
2019
        errmsg_printf(ERRMSG_LVL_WARN,
2020
2020
                      " [Info] InnoDB: the file format in the system "