← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/join_cache.cc

  • Committer: Brian Aker
  • Date: 2010-05-20 18:55:16 UTC
  • mfrom: (1552.1.2 new-staging)
  • Revision ID: brian@gaz-20100520185516-gcr6tl3tm6v71kb5
Merge Brian, includes work to move all TableShare to being newed, introduced
placeholder to be used for placeholders. This also includes a number of bug
fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/join_cache.cc
119
119
    if (null_fields && tables[i].table->getNullFields())
120
120
    {                                           /* must copy null bits */
121
121
      copy->str= tables[i].table->null_flags;
122
 
      copy->length= tables[i].table->s->null_bytes;
 
122
      copy->length= tables[i].table->getShare()->null_bytes;
123
123
      copy->strip=0;
124
124
      copy->blob_field=0;
125
125
      copy->get_rowid= NULL;