← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/str/insert.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/function/str/insert.cc
42
42
      args[3]->null_value)
43
43
    goto null;
44
44
 
45
 
  if ((start < 0) || (start > res->length()))
 
45
  if ((start < 0) || (start > static_cast<int64_t>(res->length())))
46
46
    return res;                                 // Wrong param; skip insert
47
 
  if ((length < 0) || (length > res->length()))
 
47
  if ((length < 0) || (length > static_cast<int64_t>(res->length())))
48
48
    length= res->length();
49
49
 
50
50
  /* start and length are now sufficiently valid to pass to charpos function */
52
52
   length= res->charpos((int) length, (uint32_t) start);
53
53
 
54
54
  /* Re-testing with corrected params */
55
 
  if (start > res->length())
 
55
  if (start > static_cast<int64_t>(res->length()))
56
56
    return res;
57
 
  if (length > res->length() - start)
 
57
  if (length > static_cast<int64_t>(res->length()) - start)
58
58
    length= res->length() - start;
59
59
 
60
60
  if ((uint64_t) (res->length() - length + res2->length()) >