← 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-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:
storage/innobase/handler/ha_innodb.cc
2519
2519
        switch (mysql_tp) {
2520
2520
 
2521
2521
        case DRIZZLE_TYPE_STRING:
2522
 
        case DRIZZLE_TYPE_VAR_STRING:
2523
2522
        case DRIZZLE_TYPE_BLOB:
2524
2523
        case DRIZZLE_TYPE_VARCHAR:
2525
2524
                /* Use the charset number to pick the right charset struct for
2585
2584
        the type */
2586
2585
 
2587
2586
        assert((ulint)DRIZZLE_TYPE_STRING < 256);
2588
 
        assert((ulint)DRIZZLE_TYPE_VAR_STRING < 256);
2589
2587
        assert((ulint)DRIZZLE_TYPE_DOUBLE < 256);
2590
2588
 
2591
2589
        if (field->flags & UNSIGNED_FLAG) {
2612
2610
        switch (field->type()) {
2613
2611
                /* NOTE that we only allow string types in DATA_MYSQL and
2614
2612
                DATA_VARMYSQL */
2615
 
        case DRIZZLE_TYPE_VAR_STRING: /* old <= 4.1 VARCHAR */
2616
2613
        case DRIZZLE_TYPE_VARCHAR:    /* new >= 5.0.3 true VARCHAR */
2617
2614
                if (field->binary()) {
2618
2615
                        return(DATA_BINARY);
2910
2907
 
2911
2908
                        if (real_type != DRIZZLE_TYPE_ENUM
2912
2909
                                && real_type != DRIZZLE_TYPE_SET
2913
 
                                && ( mysql_type == DRIZZLE_TYPE_VAR_STRING
2914
 
                                        || mysql_type == DRIZZLE_TYPE_STRING)) {
 
2910
                                && (mysql_type == DRIZZLE_TYPE_STRING)) {
2915
2911
 
2916
2912
                                cs = field->charset();
2917
2913