← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table.cc

  • Committer: Brian Aker
  • Date: 2010-10-22 00:26:57 UTC
  • mfrom: (1864.4.6 refactor)
  • Revision ID: brian@tangent.org-20101022002657-f5d3isth30d0urop
Merge of refactor2 tree

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table.cc
81
81
 
82
82
  if (db_stat)
83
83
    error= cursor->close();
84
 
  free((char*) alias);
85
 
  alias= NULL;
 
84
  _alias.clear();
86
85
  if (field)
87
86
  {
88
87
    for (Field **ptr=field ; *ptr ; ptr++)
104
103
    {
105
104
      delete getShare();
106
105
    }
107
 
 
108
106
    setShare(NULL);
109
107
  }
 
108
 
 
109
  return error;
 
110
}
 
111
 
 
112
Table::~Table()
 
113
{
110
114
  mem_root.free_root(MYF(0));
111
 
 
112
 
  return error;
113
115
}
114
116
 
115
117
 
142
144
 
143
145
  pos_in_table_list= NULL;
144
146
  group= NULL;
145
 
  alias= NULL;
 
147
  _alias.clear();
146
148
  null_flags= NULL;
147
149
 
148
150
  lock_position= 0;
887
889
  table->getMutableShare()->setFields(field_count+1);
888
890
  table->setFields(table->getMutableShare()->getFields(true));
889
891
  reg_field= table->getMutableShare()->getFields(true);
890
 
  table->alias= table_alias;
 
892
  table->setAlias(table_alias);
891
893
  table->reginfo.lock_type=TL_WRITE;    /* Will be updated */
892
894
  table->db_stat=HA_OPEN_KEYFILE+HA_OPEN_RNDFILE;
893
895
  table->map=1;
1705
1707
  timestamp_field(NULL),
1706
1708
  pos_in_table_list(NULL),
1707
1709
  group(NULL),
1708
 
  alias(NULL),
1709
1710
  null_flags(NULL),
1710
1711
  lock_position(0),
1711
1712
  lock_data_start(0),