← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzledump_mysql.cc

  • Committer: Lee Bieber
  • Date: 2010-10-21 01:33:55 UTC
  • mfrom: (1864.1.3 build)
  • Revision ID: kalebral@gmail.com-20101021013355-uywuclusdprnf8nl
Merge Brian - Add support for --with-valgrind
Merge Mark - event_observer.h did not declare "class Session;" so it depended on being #include'ed after "session.h".
Merge Andrew - Fix bug #663554: drizzledump is not honoring --destination-database option
Merge Andrew - Fix bug #663812: drizzledump truncation for DOUBLE data type with no preset scale/precision

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzledump_mysql.cc
203
203
    field->isAutoIncrement= (strcmp(row[8], "auto_increment") == 0) ? true : false;
204
204
    field->defaultIsNull= field->isNull;
205
205
    field->length= (row[4]) ? boost::lexical_cast<uint32_t>(row[4]) : 0;
206
 
    field->decimalPrecision= (row[5]) ? boost::lexical_cast<uint32_t>(row[5]) : 0;
207
 
    field->decimalScale= (row[6]) ? boost::lexical_cast<uint32_t>(row[6]) : 0;
208
 
 
 
206
    if ((row[5] != NULL) and (row[6] != NULL))
 
207
    {
 
208
      field->decimalPrecision= boost::lexical_cast<uint32_t>(row[5]);
 
209
      field->decimalScale= boost::lexical_cast<uint32_t>(row[6]);
 
210
    }
 
211
    else
 
212
    {
 
213
      field->decimalPrecision= 0;
 
214
      field->decimalScale= 0;
 
215
    }
209
216
 
210
217
    fields.push_back(field);
211
218
  }