← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/sql_table.cc

  • Committer: Brian Aker
  • Date: 2011-02-14 22:31:26 UTC
  • mto: This revision was merged to the branch mainline in revision 2171.
  • Revision ID: brian@tangent.org-20110214223126-rabur7v6dz3m989p
Fix issues where int display length may be too small, and fix collation
cases around dates (which are always binary).

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/sql_table.cc
1231
1231
 
1232
1232
    if (session->variables.sql_mode & MODE_NO_ZERO_DATE &&
1233
1233
        !sql_field->def &&
1234
 
        sql_field->sql_type == DRIZZLE_TYPE_TIMESTAMP &&
 
1234
        (sql_field->sql_type == DRIZZLE_TYPE_TIMESTAMP  or sql_field->sql_type == DRIZZLE_TYPE_MICROTIME) &&
1235
1235
        (sql_field->flags & NOT_NULL_FLAG) &&
1236
1236
        (type == Field::NONE || type == Field::TIMESTAMP_UN_FIELD))
1237
1237
    {