← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/field/fstring.cc

  • Committer: Brian Aker
  • Date: 2008-07-28 03:45:43 UTC
  • mfrom: (212.1.8 codestyle)
  • Revision ID: brian@tangent.org-20080728034543-qulvxdig8powjsj1
Merge from Monty

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/field/fstring.cc
203
203
 
204
204
  length= cs->cset->snprintf(cs,(char*) res.ptr(),
205
205
                             res.alloced_length(), "%s(%d)",
206
 
                             ((type() == MYSQL_TYPE_VAR_STRING &&
 
206
                             ((type() == DRIZZLE_TYPE_VAR_STRING &&
207
207
                               !thd->variables.new_mode) ?
208
208
                              (has_charset() ? "varchar" : "varbinary") :
209
209
                              (has_charset() ? "char" : "binary")),
412
412
                               bool keep_type)
413
413
{
414
414
  Field *field;
415
 
  if (type() != MYSQL_TYPE_VAR_STRING || keep_type)
 
415
  if (type() != DRIZZLE_TYPE_VAR_STRING || keep_type)
416
416
    field= Field::new_field(root, new_table, keep_type);
417
417
  else if ((field= new Field_varstring(field_length, maybe_null(), field_name,
418
418
                                       new_table->s, charset())))