← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Monty Taylor
  • Date: 2008-07-15 21:40:58 UTC
  • mfrom: (77.1.113 codestyle32)
  • mto: This revision was merged to the branch mainline in revision 176.
  • Revision ID: mordred@camelot-20080715214058-rm3phulldos9xehv
Merged from codestyle.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/handler/ha_innodb.cc
1443
1443
        innobase_hton->flags=HTON_NO_FLAGS;
1444
1444
        innobase_hton->release_temporary_latches=innobase_release_temporary_latches;
1445
1445
 
1446
 
        ut_a(DATA_MYSQL_TRUE_VARCHAR == (ulint)MYSQL_TYPE_VARCHAR);
 
1446
        ut_a(DATA_MYSQL_TRUE_VARCHAR == (ulint)MYSQL_TYPE_VARCHAR);
1447
1447
 
1448
1448
#ifdef UNIV_DEBUG
1449
1449
        static const char       test_filename[] = "-@";
2633
2633
        DBUG_ASSERT((ulint)MYSQL_TYPE_STRING < 256);
2634
2634
        DBUG_ASSERT((ulint)MYSQL_TYPE_VAR_STRING < 256);
2635
2635
        DBUG_ASSERT((ulint)MYSQL_TYPE_DOUBLE < 256);
2636
 
        DBUG_ASSERT((ulint)MYSQL_TYPE_FLOAT < 256);
2637
2636
 
2638
2637
        if (field->flags & UNSIGNED_FLAG) {
2639
2638
 
2692
2691
        case MYSQL_TYPE_TIME:
2693
2692
        case MYSQL_TYPE_TIMESTAMP:
2694
2693
                return(DATA_INT);
2695
 
        case MYSQL_TYPE_FLOAT:
2696
 
                return(DATA_FLOAT);
2697
2694
        case MYSQL_TYPE_DOUBLE:
2698
2695
                return(DATA_DOUBLE);
2699
2696
        case MYSQL_TYPE_BLOB: