← Back to branch summary

~posulliv/drizzle/optimizer-style-cleanup

« back to all changes in this revision

Viewing changes to drizzled/field.cc

  • Committer: Padraig O'Sullivan
  • Date: 2010-04-17 01:38:47 UTC
  • mfrom: (1237.9.238 bad-staging)
  • Revision ID: osullivan.padraig@gmail.com-20100417013847-ibjioqsfbmf5yg4g
Merge trunk.

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
1128
1128
  {
1129
1129
    /* DBL_DIG is enough to print '-[digits].E+###' */
1130
1130
    char str_nr[DBL_DIG + 8];
1131
 
    uint32_t str_len= sprintf(str_nr, "%g", nr);
 
1131
    uint32_t str_len= snprintf(str_nr, sizeof(str_nr), "%g", nr);
1132
1132
    make_truncated_value_warning(session, level, str_nr, str_len, ts_type,
1133
1133
                                 field_name);
1134
1134
  }