← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_proto.cc

  • Committer: Mark Atwood
  • Date: 2011-07-13 22:28:29 UTC
  • mfrom: (2318.7.25 refactor1)
  • Revision ID: me@mark.atwood.name-20110713222829-sswp061b5ts7tc1k
merge lp:~olafvdspek/drizzle/refactor1

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_proto.cc
343
343
          }
344
344
        }
345
345
 
346
 
        if ((field_arg->sql_type==DRIZZLE_TYPE_VARCHAR
347
 
            && field_arg->charset==&my_charset_bin)
348
 
           || (field_arg->sql_type==DRIZZLE_TYPE_BLOB
349
 
            && field_arg->charset==&my_charset_bin))
 
346
        if ((field_arg->sql_type == DRIZZLE_TYPE_VARCHAR && field_arg->charset == &my_charset_bin)
 
347
           || (field_arg->sql_type == DRIZZLE_TYPE_BLOB && field_arg->charset == &my_charset_bin))
350
348
        {
351
 
          string bin_default;
352
 
          bin_default.assign(default_value->c_ptr(),
353
 
                             default_value->length());
354
 
          field_options->set_default_bin_value(bin_default);
 
349
          field_options->set_default_bin_value(string(default_value->c_ptr(), default_value->length()));
355
350
        }
356
351
        else
357
352
        {