← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/innobase/handler/ha_innodb.cc

Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/handler/ha_innodb.cc
2635
2635
        DBUG_ASSERT((ulint)MYSQL_TYPE_VAR_STRING < 256);
2636
2636
        DBUG_ASSERT((ulint)MYSQL_TYPE_DOUBLE < 256);
2637
2637
        DBUG_ASSERT((ulint)MYSQL_TYPE_FLOAT < 256);
2638
 
        DBUG_ASSERT((ulint)MYSQL_TYPE_DECIMAL < 256);
2639
2638
 
2640
2639
        if (field->flags & UNSIGNED_FLAG) {
2641
2640
 
2699
2698
                return(DATA_FLOAT);
2700
2699
        case MYSQL_TYPE_DOUBLE:
2701
2700
                return(DATA_DOUBLE);
2702
 
        case MYSQL_TYPE_DECIMAL:
2703
 
                return(DATA_DECIMAL);
2704
2701
        case MYSQL_TYPE_TINY_BLOB:
2705
2702
        case MYSQL_TYPE_MEDIUM_BLOB:
2706
2703
        case MYSQL_TYPE_BLOB: