← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_share.cc

  • Committer: Brian Aker
  • Date: 2010-07-20 04:57:51 UTC
  • mfrom: (1663.1.4 rollup)
  • Revision ID: brian@gaz-20100720045751-5cq4deswbydxuek7
Merge Brian + Stware.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_share.cc
909
909
  block_size= table_options.has_block_size() ?
910
910
    table_options.block_size() : 0;
911
911
 
912
 
  table_charset= get_charset(table_options.has_collation_id()?
913
 
                                    table_options.collation_id() : 0);
 
912
  table_charset= get_charset(table_options.collation_id());
914
913
 
915
914
  if (!table_charset)
916
915
  {
917
 
    /* unknown charset in head[38] or pre-3.23 frm */
918
 
    if (use_mb(default_charset_info))
919
 
    {
920
 
      /* Warn that we may be changing the size of character columns */
921
 
      errmsg_printf(ERRMSG_LVL_WARN,
922
 
                    _("'%s' had no or invalid character set, "
923
 
                      "and default character set is multi-byte, "
924
 
                      "so character column sizes may have changed"),
925
 
                    getPath());
926
 
    }
927
 
    table_charset= default_charset_info;
 
916
    char errmsg[100];
 
917
    snprintf(errmsg, sizeof(errmsg),
 
918
             _("Table %s has invalid/unknown collation: %d,%s"),
 
919
             getPath(),
 
920
             table_options.collation_id(),
 
921
             table_options.collation().c_str());
 
922
    errmsg[99]='\0';
 
923
 
 
924
    my_error(ER_CORRUPT_TABLE_DEFINITION, MYF(0), errmsg);
 
925
    return ER_CORRUPT_TABLE_DEFINITION;
928
926
  }
929
927
 
930
928
  db_record_offset= 1;