← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_share.h

  • Committer: Brian Aker
  • Date: 2010-05-18 23:58:31 UTC
  • mfrom: (1532.1.9 fix-table)
  • Revision ID: brian@gaz-20100518235831-nji9mm9ju2eekelw
Merge of overall patch for TableShare new() work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_share.h
270
270
    return mem_root.strmake_root(str_arg, len_arg);
271
271
  }
272
272
 
 
273
  memory::Root *getMemRoot()
 
274
  {
 
275
    return &mem_root;
 
276
  }
 
277
 
273
278
private:
274
279
  std::vector<std::string> _keynames;
275
280
 
770
775
                    const CHARSET_INFO * field_charset,
771
776
                    Field::utype unireg_check,
772
777
                    TYPELIB *interval,
773
 
                    const char *field_name)
774
 
  {
775
 
    return make_field(&mem_root, ptr, field_length, is_nullable, null_pos, null_bit, decimals, field_type, field_charset, unireg_check, interval, field_name);
776
 
  }
777
 
 
778
 
  Field *make_field(memory::Root *root,
779
 
                    unsigned char *ptr,
780
 
                    uint32_t field_length,
781
 
                    bool is_nullable,
782
 
                    unsigned char *null_pos,
783
 
                    unsigned char null_bit,
784
 
                    uint8_t decimals,
785
 
                    enum_field_types field_type,
786
 
                    const CHARSET_INFO * field_charset,
787
 
                    Field::utype unireg_check,
788
 
                    TYPELIB *interval,
789
778
                    const char *field_name);
790
779
 
791
780
  int open_table_def(Session& session, TableIdentifier &identifier);