← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_proto_write.cc

have table wide default collation/collation_id in table proto as well as move to only storing it when it's not the default (utf8_general_ci). This means that the replication stream now doesn't produce COLLATE= in the transformation of create table back to SQL.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_proto_write.cc
310
310
    }
311
311
  }
312
312
 
313
 
  if (create_info->default_table_charset)
 
313
  if (create_info->default_table_charset
 
314
      && create_info->default_table_charset != default_charset_info)
314
315
  {
315
316
    table_options->set_collation_id(
316
317
                               create_info->default_table_charset->number);