← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sys_var.cc

  • Committer: Mark Atwood
  • Date: 2011-06-22 20:04:22 UTC
  • mfrom: (2318.6.39 rf)
  • Revision ID: me@mark.atwood.name-20110622200422-609npl456o0e5p32
merge lp:~olafvdspek/drizzle/refactor13

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sys_var.cc
426
426
static void fix_session_mem_root(Session *session, sql_var_t type)
427
427
{
428
428
  if (type != OPT_GLOBAL)
429
 
    session->mem_root->reset_root_defaults(session->variables.query_alloc_block_size,
430
 
                                           session->variables.query_prealloc_size);
 
429
    session->mem.reset_defaults(session->variables.query_alloc_block_size, session->variables.query_prealloc_size);
431
430
}
432
431
 
433
432
 
435
434
{
436
435
}
437
436
 
438
 
 
439
437
void throw_bounds_warning(Session *session, bool fixed, bool unsignd, const std::string &name, int64_t val)
440
438
{
441
439
  if (not fixed)
963
961
    if (str)
964
962
    {
965
963
      uint32_t length= strlen(str);
966
 
      tmp= new Item_string(session->strmake(str, length), length,
967
 
                           system_charset_info, DERIVATION_SYSCONST);
 
964
      tmp= new Item_string(session->mem.strmake(str, length), length, system_charset_info, DERIVATION_SYSCONST);
968
965
    }
969
966
    else
970
967
    {
1408
1405
 
1409
1406
drizzle_show_var* enumerate_sys_vars(Session *session)
1410
1407
{
1411
 
  int size= sizeof(drizzle_show_var) * (system_variable_map.size() + 1);
1412
 
  drizzle_show_var *result= (drizzle_show_var*) session->getMemRoot()->allocate(size);
1413
 
 
1414
 
  if (result)
 
1408
  drizzle_show_var *result= (drizzle_show_var*) session->mem.alloc(sizeof(drizzle_show_var) * (system_variable_map.size() + 1));
 
1409
  drizzle_show_var *show= result;
 
1410
  BOOST_FOREACH(SystemVariableMap::const_reference iter, system_variable_map)
1415
1411
  {
1416
 
    drizzle_show_var *show= result;
1417
 
    BOOST_FOREACH(SystemVariableMap::const_reference iter, system_variable_map)
1418
 
    {
1419
 
      sys_var *var= iter.second;
1420
 
      show->name= var->getName().c_str();
1421
 
      show->value= (char*) var;
1422
 
      show->type= SHOW_SYS;
1423
 
      ++show;
1424
 
    }
1425
 
 
1426
 
    /* make last element empty */
1427
 
    memset(show, 0, sizeof(drizzle_show_var));
 
1412
    sys_var *var= iter.second;
 
1413
    show->name= var->getName().c_str();
 
1414
    show->value= (char*) var;
 
1415
    show->type= SHOW_SYS;
 
1416
    ++show;
1428
1417
  }
 
1418
 
 
1419
  /* make last element empty */
 
1420
  memset(show, 0, sizeof(drizzle_show_var));
1429
1421
  return result;
1430
1422
}
1431
1423
 
1593
1585
                                                         sql_var_t type,
1594
1586
                                                         const LEX_STRING *)
1595
1587
{
1596
 
  unsigned char* result;
1597
 
  string engine_name;
1598
1588
  plugin::StorageEngine *engine= session->variables.*offset;
1599
1589
  if (type == OPT_GLOBAL)
1600
1590
    engine= global_system_variables.*offset;
1601
 
  engine_name= engine->getName();
1602
 
  result= (unsigned char *) session->strmake(engine_name.c_str(),
1603
 
                                             engine_name.size());
1604
 
  return result;
 
1591
  string engine_name= engine->getName();
 
1592
  return (unsigned char *) session->mem.strmake(engine_name);
1605
1593
}
1606
1594
 
1607
1595