← 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-07 20:07:55 UTC
  • mto: (2067.3.1 clean)
  • mto: This revision was merged to the branch mainline in revision 2073.
  • Revision ID: brian@tangent.org-20110107200755-igzg029ujqep5rei
A few small fixes, plus move the schema lock to the actual catalog.

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
 
  assert(getSession().catalog());
37
 
  assert(not getSession().catalog()->name().empty());
 
36
  assert(not getSession().catalog().name().empty());
38
37
 
39
 
  str->copy(getSession().catalog()->name(), system_charset_info);
 
38
  str->copy(getSession().catalog().name(), system_charset_info);
40
39
 
41
40
  return str;
42
41
}