← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/utility_functions/catalog.cc

  • Committer: Brian Aker
  • Date: 2011-01-11 07:12:09 UTC
  • mfrom: (2068.5.6 catalogs)
  • Revision ID: brian@gir-3-20110111071209-ntbex8btgayoq00v
Merge in catalogs.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/utility_functions/catalog.cc
33
33
String *Catalog::val_str(String *str)
34
34
{
35
35
  assert(fixed == 1);
36
 
  Session *session= current_session;
37
 
  if (session->catalog.empty())
38
 
  {
39
 
    null_value= 1;
40
 
    return 0;
41
 
  }
42
 
  else
43
 
  {
44
 
    str->copy(session->catalog.c_str(), session->catalog.length(), system_charset_info);
45
 
  }
 
36
  assert(not getSession().catalog().name().empty());
 
37
 
 
38
  str->copy(getSession().catalog().name(), system_charset_info);
46
39
 
47
40
  return str;
48
41
}