← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Monty Taylor
  • Date: 2008-07-31 05:13:04 UTC
  • mfrom: (240 drizzle)
  • mto: (202.3.5 gettextize)
  • mto: This revision was merged to the branch mainline in revision 243.
  • Revision ID: monty@inaugust.com-20080731051304-a9kawbozru3fic1g
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
959
959
    */
960
960
    if (sql_field->def && 
961
961
        save_cs != sql_field->def->collation.collation &&
962
 
        (sql_field->sql_type == DRIZZLE_TYPE_VAR_STRING ||
963
 
         sql_field->sql_type == DRIZZLE_TYPE_STRING ||
 
962
        (sql_field->sql_type == DRIZZLE_TYPE_STRING ||
964
963
         sql_field->sql_type == DRIZZLE_TYPE_SET ||
965
964
         sql_field->sql_type == DRIZZLE_TYPE_ENUM))
966
965
    {