← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field.cc

  • Committer: Brian Aker
  • Date: 2010-05-09 23:33:20 UTC
  • mfrom: (1502.1.22 fix-myisam)
  • Revision ID: brian@gaz-20100509233320-2ejod14ukaiqoqjk
Merge in modifications to make TableShare and actual object. 

Crazy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field.cc
720
720
  if (orig_table && orig_table->s->getSchemaName() && *orig_table->s->getSchemaName())
721
721
  {
722
722
    field->db_name= orig_table->s->getSchemaName();
723
 
    field->org_table_name= orig_table->s->table_name.str;
 
723
    field->org_table_name= orig_table->s->getTableName();
724
724
  }
725
725
  else
726
726
    field->org_table_name= field->db_name= "";
918
918
  return 0;                                     // This shouldn't happen
919
919
}
920
920
 
921
 
Field *make_field(TableShare *share,
922
 
                  memory::Root *root,
923
 
                  unsigned char *ptr,
924
 
                  uint32_t field_length,
925
 
                  bool is_nullable,
926
 
                  unsigned char *null_pos,
927
 
                  unsigned char null_bit,
928
 
                  uint8_t decimals,
929
 
                  enum_field_types field_type,
930
 
                  const CHARSET_INFO * field_charset,
931
 
                  Field::utype unireg_check,
932
 
                  TYPELIB *interval,
933
 
                  const char *field_name)
 
921
Field *TableShare::make_field(memory::Root *root,
 
922
                              unsigned char *ptr,
 
923
                              uint32_t field_length,
 
924
                              bool is_nullable,
 
925
                              unsigned char *null_pos,
 
926
                              unsigned char null_bit,
 
927
                              uint8_t decimals,
 
928
                              enum_field_types field_type,
 
929
                              const CHARSET_INFO * field_charset,
 
930
                              Field::utype unireg_check,
 
931
                              TYPELIB *interval,
 
932
                              const char *field_name)
934
933
{
 
934
  TableShare *share= this;
935
935
  assert(root);
936
936
 
937
937
  if (! is_nullable)