← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/function/str/insert.cc

  • Committer: Stewart Smith
  • Date: 2010-11-03 03:27:09 UTC
  • mto: (1902.1.1 build) (1910.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1903.
  • Revision ID: stewart@flamingspork.com-20101103032709-oyvfrc6eb8fzj0mr
fix docs warning: docs/unlock.rst:2: (WARNING/2) Title underline too short.

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()) >
61
 
      (uint64_t) current_session->variables.max_allowed_packet)
 
61
      (uint64_t) session.variables.max_allowed_packet)
62
62
  {
63
 
    push_warning_printf(current_session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
 
63
    push_warning_printf(&session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
64
64
                        ER_WARN_ALLOWED_PACKET_OVERFLOWED,
65
65
                        ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED),
66
 
                        func_name(), current_session->variables.max_allowed_packet);
 
66
                        func_name(), session.variables.max_allowed_packet);
67
67
    goto null;
68
68
  }
69
69
  res=copy_if_not_alloced(str,res,res->length());