← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to sql/sql_table.cc

  • Committer: Brian Aker
  • Date: 2008-07-08 18:37:01 UTC
  • Revision ID: brian@tangent.org-20080708183701-2g828ir7rpnirv3f
Second pass at removing old varchar.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/sql_table.cc
1714
1714
    (*blob_columns)++;
1715
1715
    break;
1716
1716
  case MYSQL_TYPE_VARCHAR:
1717
 
#ifndef QQ_ALL_HANDLERS_SUPPORT_VARCHAR
1718
 
    if (table_flags & HA_NO_VARCHAR)
1719
 
    {
1720
 
      /* convert VARCHAR to CHAR because handler is not yet up to date */
1721
 
      sql_field->sql_type=    MYSQL_TYPE_VAR_STRING;
1722
 
      sql_field->pack_length= calc_pack_length(sql_field->sql_type,
1723
 
                                               (uint) sql_field->length);
1724
 
      if ((sql_field->length / sql_field->charset->mbmaxlen) >
1725
 
          MAX_FIELD_CHARLENGTH)
1726
 
      {
1727
 
        my_printf_error(ER_TOO_BIG_FIELDLENGTH, ER(ER_TOO_BIG_FIELDLENGTH),
1728
 
                        MYF(0), sql_field->field_name, MAX_FIELD_CHARLENGTH);
1729
 
        return(1);
1730
 
      }
1731
 
    }
1732
 
#endif
1733
 
    /* fall through */
1734
1717
  case MYSQL_TYPE_STRING:
1735
1718
    sql_field->pack_flag=0;
1736
1719
    if (sql_field->charset->state & MY_CS_BINSORT)