← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/locate.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/locate.cc
50
50
  {
51
51
    start0= start= args[2]->val_int() - 1;
52
52
 
53
 
    if ((start < 0) || (start > a->length()))
 
53
    if ((start < 0) || (start > static_cast<int64_t>(a->length())))
54
54
      return 0;
55
55
 
56
56
    /* start is now sufficiently valid to pass to charpos function */