← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/locate.cc

  • Committer: Monty Taylor
  • Date: 2011-02-13 17:26:39 UTC
  • mfrom: (2157.2.2 give-in-to-pkg-config)
  • mto: This revision was merged to the branch mainline in revision 2166.
  • Revision ID: mordred@inaugust.com-20110213172639-nhy7i72sfhoq13ms
Merged in pkg-config fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/locate.cc
1
1
/* -*- mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; -*-
2
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
3
3
 *
4
 
 *  Copyright (C) 2008 Sun Microsystems
 
4
 *  Copyright (C) 2008 Sun Microsystems, Inc.
5
5
 *
6
6
 *  This program is free software; you can redistribute it and/or modify
7
7
 *  it under the terms of the GNU General Public License as published by
19
19
 
20
20
#include "config.h"
21
21
 
 
22
#include <drizzled/charset_info.h>
22
23
#include <drizzled/function/locate.h>
 
24
#include <drizzled/lex_string.h>
23
25
 
24
26
namespace drizzled
25
27
{
50
52
  {
51
53
    start0= start= args[2]->val_int() - 1;
52
54
 
53
 
    if ((start < 0) || (start > a->length()))
 
55
    if ((start < 0) || (start > static_cast<int64_t>(a->length())))
54
56
      return 0;
55
57
 
56
58
    /* start is now sufficiently valid to pass to charpos function */