← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/session.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/session.cc
1156
1156
    else
1157
1157
    {
1158
1158
      if (fixed_row_size)
1159
 
        used_length= min(res->length(),item->max_length);
 
1159
        used_length= min(res->length(), static_cast<size_t>(item->max_length));
1160
1160
      else
1161
1161
        used_length= res->length();
1162
1162