← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/show.cc

  • Committer: Brian Aker
  • Date: 2009-05-14 08:35:31 UTC
  • mto: This revision was merged to the branch mainline in revision 1016.
  • Revision ID: brian@gaz-20090514083531-shers31p7s7zqldi
Simplify the calling stack for getting schema collation. We need to extend
this further by removing the schema collation from session (in order to
remove the need for a cache).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/show.cc
412
412
  String buffer(buff, sizeof(buff), system_charset_info);
413
413
  Protocol *protocol=session->protocol;
414
414
 
415
 
  if (store_db_create_info(session, dbname, &buffer, create_info))
 
415
  if (store_db_create_info(dbname, &buffer, create_info))
416
416
  {
417
417
    /*
418
418
      This assumes that the only reason for which store_db_create_info()
926
926
  @returns true if errors are detected, false otherwise.
927
927
*/
928
928
 
929
 
bool store_db_create_info(Session *session, const char *dbname, String *buffer,
930
 
                          HA_CREATE_INFO *create_info)
 
929
bool store_db_create_info(const char *dbname, String *buffer, HA_CREATE_INFO *create_info)
931
930
{
932
931
  HA_CREATE_INFO create;
933
932
  uint32_t create_options = create_info ? create_info->options : 0;
943
942
    if (check_db_dir_existence(dbname))
944
943
      return(true);
945
944
 
946
 
    load_db_opt_by_name(session, dbname, &create);
 
945
    load_db_opt_by_name(dbname, &create);
947
946
  }
948
947
 
949
948
  buffer->length(0);
2678
2677
    }
2679
2678
    {
2680
2679
      HA_CREATE_INFO create;
2681
 
      load_db_opt_by_name(session, db_name->str, &create);
 
2680
      load_db_opt_by_name(db_name->str, &create);
2682
2681
 
2683
2682
      if (store_schema_shemata(session, table, db_name,
2684
2683
                               create.default_table_charset))