← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

Merge refactored command line using for innodb

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/handler/ha_innodb.cc
1961
1961
 
1962
1962
  if (vm.count("additional-mem-pool-size"))
1963
1963
  {
1964
 
    if (innobase_additional_mem_pool_size < 512*1024L || innobase_additional_mem_pool_size > (long)INT64_MAX)
 
1964
    if (innobase_additional_mem_pool_size < 512*1024L || innobase_additional_mem_pool_size > LONG_MAX)
1965
1965
    {
1966
1966
      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value for additional-mem-pool-size\n"));
1967
1967
      exit(-1);
1968
1968
    }
1969
1969
 
1970
 
    innobase_additional_mem_pool_size/= 1024*1024L;
1971
 
    innobase_additional_mem_pool_size*= 1024*1024L;
 
1970
    innobase_additional_mem_pool_size/= 1024;
 
1971
    innobase_additional_mem_pool_size*= 1024;
1972
1972
  }
1973
1973
 
1974
1974
  if (vm.count("commit-concurrency"))
2151
2151
    }
2152
2152
  }
2153
2153
 
 
2154
  if (vm.count("support-xa"))
 
2155
  {
 
2156
    (SessionVAR(NULL,support_xa))= vm["support-xa"].as<bool>();
 
2157
  }
 
2158
 
 
2159
  if (vm.count("table-locks"))
 
2160
  {
 
2161
    (SessionVAR(NULL,table_locks))= vm["table-locks"].as<bool>();
 
2162
  }
 
2163
 
 
2164
  if (vm.count("strict-mode"))
 
2165
  {
 
2166
    (SessionVAR(NULL,strict_mode))= vm["strict-mode"].as<bool>();
 
2167
  }
 
2168
 
 
2169
  if (vm.count("lock-wait-timeout"))
 
2170
  {
 
2171
    if (vm["strict-mode"].as<unsigned long>() < 1 || vm["strict-mode"].as<unsigned long>() > 1024*1024*1024)
 
2172
    {
 
2173
      errmsg_printf(ERRMSG_LVL_ERROR, _("Invalid value for io-capacity\n"));
 
2174
      exit(-1);
 
2175
    }
 
2176
 
 
2177
    (SessionVAR(NULL,strict_mode))= vm["strict-mode"].as<unsigned long>();
 
2178
  }
 
2179
 
2154
2180
  innodb_engine_ptr= actuall_engine_ptr= new InnobaseEngine(innobase_engine_name);
2155
2181
 
2156
2182
  ut_a(DATA_MYSQL_TRUE_VARCHAR == (ulint)DRIZZLE_TYPE_VARCHAR);
9036
9062
  context("read-ahead-threshold",
9037
9063
          po::value<unsigned long>(&srv_read_ahead_threshold)->default_value(56),
9038
9064
          "Number of pages that must be accessed sequentially for InnoDB to trigger a readahead.");
 
9065
  context("support-xa",
 
9066
          po::value<bool>()->default_value(true)->zero_tokens(),
 
9067
          "Enable InnoDB support for the XA two-phase commit");
 
9068
  context("table-locks",
 
9069
          po::value<bool>()->default_value(true)->zero_tokens(),
 
9070
          "Enable InnoDB locking in LOCK TABLES");
 
9071
  context("strict-mode",
 
9072
          po::value<bool>()->default_value(false)->zero_tokens(),
 
9073
          "Use strict mode when evaluating create options.");
 
9074
  context("lock-wait-timeout",
 
9075
          po::value<unsigned long>()->default_value(50),
 
9076
          "Timeout in seconds an InnoDB transaction may wait for a lock before being rolled back. Values above 100000000 disable the timeout.");
9039
9077
}
9040
9078
 
9041
9079
static drizzle_sys_var* innobase_system_variables[]= {