← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/system_variables.h

  • Committer: Henrik Ingo
  • Date: 2011-09-23 06:14:37 UTC
  • mfrom: (2425 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2439.
  • Revision ID: henrik.ingo@avoinelama.fi-20110923061437-ct1wedkb9s47uy2t
Merge newest trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/system_variables.h
82
82
  /* Both charset and collation parts of these variables are important */
83
83
  const charset_info_st *collation_server;
84
84
 
85
 
  inline const charset_info_st  *getCollation(void) 
 
85
  const charset_info_st* getCollation() const
86
86
  {
87
87
    return collation_server;
88
88
  }