← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field.cc

Merged trunk and mysql-protocol-password-udf changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field.cc
716
716
 
717
717
void Field::make_field(SendField *field)
718
718
{
719
 
  if (orig_table && orig_table->s->db.str && *orig_table->s->db.str)
 
719
  if (orig_table && orig_table->s->getSchemaName() && *orig_table->s->getSchemaName())
720
720
  {
721
 
    field->db_name= orig_table->s->db.str;
 
721
    field->db_name= orig_table->s->getSchemaName();
722
722
    field->org_table_name= orig_table->s->table_name.str;
723
723
  }
724
724
  else