← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/decimal.cc

  • Committer: lbieber
  • Date: 2010-10-07 02:59:11 UTC
  • mfrom: (1818.1.2 build)
  • Revision ID: lbieber@orisndriz08-20101007025911-rz1n8q23hrwxks6v
Merge Brian - Fix a large number of warning issues on ICC. sql_string becomes 64bit
Merge Monty - clean up ICC warnings

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/decimal.cc
289
289
  String tmp(buff, sizeof(buff), &my_charset_bin);
290
290
  if (charset->mbminlen > 1)
291
291
  {
292
 
    uint32_t dummy_errors;
 
292
    size_t dummy_errors;
293
293
    tmp.copy(from, length, charset, &my_charset_utf8_general_ci, &dummy_errors);
294
294
    from= tmp.ptr();
295
295
    length=  tmp.length();