← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_proto_write.cc

  • Committer: lbieber
  • Date: 2010-10-08 01:11:05 UTC
  • mfrom: (1821.1.4 build)
  • Revision ID: lbieber@orisndriz08-20101008011105-1tbwbvz9me9fy7ua
Merge Monty - Fixed the last of the ICC warnings. Turned on warnings=errors
Merge Brian - fixu bug #655558: SELECT 102/(1-1) should error on divide by zero          
Merge Brian - fix bug #654219: information_schema.key_column_usage does not contain information about FKs

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_proto_write.cc
448
448
 
449
449
      idx->set_comment(key_info[i].comment.str);
450
450
    }
451
 
    if (key_info[i].flags & 
452
 
        ~(HA_NOSAME | HA_PACK_KEY | HA_USES_BLOCK_SIZE | 
453
 
          HA_BINARY_PACK_KEY | HA_VAR_LENGTH_PART | HA_NULL_PART_KEY | 
454
 
          HA_KEY_HAS_PART_KEY_SEG | HA_GENERATED_KEY | HA_USES_COMMENT))
 
451
    static const uint64_t unknown_index_flag= (HA_NOSAME | HA_PACK_KEY |
 
452
                                               HA_USES_BLOCK_SIZE | 
 
453
                                               HA_BINARY_PACK_KEY |
 
454
                                               HA_VAR_LENGTH_PART |
 
455
                                               HA_NULL_PART_KEY | 
 
456
                                               HA_KEY_HAS_PART_KEY_SEG |
 
457
                                               HA_GENERATED_KEY |
 
458
                                               HA_USES_COMMENT);
 
459
    if (key_info[i].flags & ~unknown_index_flag)
455
460
      abort(); // Invalid (unknown) index flag.
456
461
 
457
462
    for(unsigned int j=0; j< key_info[i].key_parts; j++)