← 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-10-21 14:25:19 UTC
  • mfrom: (2440.2.28 rf)
  • Revision ID: me@mark.atwood.name-20111021142519-bqnyqrkthibv70rc
Tags: 2011.10.28
merge lp:~olafvdspek/drizzle/refactor6

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sys_var.cc
973
973
  }
974
974
  case SHOW_CHAR:
975
975
  {
976
 
    Item *tmp;
977
976
    boost::mutex::scoped_lock scopedLock(session->catalog().systemVariableLock());
978
 
    char *str= (char*) value_ptr(session, var_type, base);
979
 
    if (str)
980
 
      tmp= new Item_string(str, strlen(str),
981
 
                           system_charset_info, DERIVATION_SYSCONST);
982
 
    else
983
 
    {
984
 
      tmp= new Item_null();
985
 
      tmp->collation.set(system_charset_info, DERIVATION_SYSCONST);
986
 
    }
987
 
 
 
977
    if (const char* str= (char*) value_ptr(session, var_type, base))
 
978
      return new Item_string(str_ref(str), system_charset_info, DERIVATION_SYSCONST);
 
979
    Item* tmp= new Item_null();
 
980
    tmp->collation.set(system_charset_info, DERIVATION_SYSCONST);
988
981
    return tmp;
989
982
  }
990
983
  default:
991
984
    my_error(ER_VAR_CANT_BE_READ, MYF(0), name.c_str());
992
985
  }
993
 
  return 0;
 
986
  return NULL;
994
987
}
995
988
 
996
989