← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/plugin/schema_engine.cc

  • Committer: Andrew Hutchings
  • Date: 2011-03-29 20:45:43 UTC
  • mfrom: (2257 drizzle)
  • mto: (2257.1.3 build)
  • mto: This revision was merged to the branch mainline in revision 2258.
  • Revision ID: andrew@linuxjedi.co.uk-20110329204543-ssex0nuo8knncgwx
Merge with trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/plugin/schema_engine.cc
114
114
}
115
115
 
116
116
 
117
 
const CHARSET_INFO *StorageEngine::getSchemaCollation(const identifier::Schema &identifier)
 
117
const charset_info_st *StorageEngine::getSchemaCollation(const identifier::Schema &identifier)
118
118
{
119
119
  message::schema::shared_ptr schmema_proto= StorageEngine::getSchemaDefinition(identifier);
120
120
  if (not schmema_proto || not schmema_proto->has_collation())
121
121
                return default_charset_info;
122
122
  const std::string buffer= schmema_proto->collation();
123
 
  if (const CHARSET_INFO* cs= get_charset_by_name(buffer.c_str()))
 
123
  if (const charset_info_st* cs= get_charset_by_name(buffer.c_str()))
124
124
                return cs;
125
125
  errmsg_printf(error::ERROR, _("Error while loading database options: '%s':"), identifier.getSQLPath().c_str());
126
126
  errmsg_printf(error::ERROR, ER(ER_UNKNOWN_COLLATION), buffer.c_str());