← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/definition/table.h

  • Committer: Brian Aker
  • Date: 2010-12-20 19:20:57 UTC
  • mto: This revision was merged to the branch mainline in revision 2016.
  • Revision ID: brian@tangent.org-20101220192057-1ch4b9uo008d8rje
Merge in additional fixes for sign, plus alter table, plus TIME on
processlist.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/definition/table.h
522
522
  uint32_t uniques;                         /* Number of UNIQUE index */
523
523
  uint32_t null_fields;                 /* number of null fields */
524
524
  uint32_t blob_fields;                 /* number of blob fields */
525
 
  uint32_t timestamp_field_offset;              /* Field number for timestamp field */
526
525
private:
527
526
  bool has_variable_width;                  /* number of varchar fields */
528
527
public:
650
649
    return output;  // for multiple << operators.
651
650
  }
652
651
 
 
652
  Field *make_field(message::Table::Field &pfield,
 
653
                    unsigned char *ptr,
 
654
                    uint32_t field_length,
 
655
                    bool is_nullable,
 
656
                    unsigned char *null_pos,
 
657
                    unsigned char null_bit,
 
658
                    uint8_t decimals,
 
659
                    enum_field_types field_type,
 
660
                    const CHARSET_INFO * field_charset,
 
661
                    Field::utype unireg_check,
 
662
                    TYPELIB *interval,
 
663
                    const char *field_name);
 
664
 
653
665
  Field *make_field(unsigned char *ptr,
654
666
                    uint32_t field_length,
655
667
                    bool is_nullable,
660
672
                    const CHARSET_INFO * field_charset,
661
673
                    Field::utype unireg_check,
662
674
                    TYPELIB *interval,
663
 
                    const char *field_name);
 
675
                    const char *field_name, 
 
676
                    bool is_unsigned);
664
677
 
665
678
  int open_table_def(Session& session, const TableIdentifier &identifier);
666
679