← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/info_schema/info_schema_methods.cc

  • Committer: Stewart Smith
  • Date: 2009-07-09 01:35:10 UTC
  • mto: (1095.1.3 merge)
  • mto: This revision was merged to the branch mainline in revision 1096.
  • Revision ID: stewart@flamingspork.com-20090709013510-ucci2fdb191chi0l
fix SHOW CREATE DATABASE for default collation. Move database metadata reading code around to be a bit more sane.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/info_schema/info_schema_methods.cc
635
635
    }
636
636
    else
637
637
    {
638
 
      HA_CREATE_INFO create;
639
 
      load_db_opt_by_name((*db_name)->str, &create);
 
638
      const CHARSET_INFO *cs= get_default_db_collation((*db_name)->str);
640
639
 
641
 
      if (store_schema_schemata(session, table, *db_name,
642
 
                               create.default_table_charset))
 
640
      if (store_schema_schemata(session, table, *db_name, cs))
643
641
        return(1);
644
642
    }
645
643