← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Brian Aker
  • Date: 2009-10-07 16:55:53 UTC
  • mfrom: (1161.2.1 bug444827)
  • Revision ID: brian@gaz-20091007165553-9tnp7liw1k9g6gvc
Merge Padraig

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/insert.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, Inc.
 
4
 *  Copyright (C) 2008 Sun Microsystems
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
17
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
18
18
 */
19
19
 
20
 
#include "config.h"
21
 
 
 
20
#include <drizzled/server_includes.h>
 
21
#include CSTDINT_H
22
22
#include <drizzled/function/str/insert.h>
23
23
#include <drizzled/error.h>
24
24
#include <drizzled/session.h>
25
25
 
26
 
namespace drizzled
27
 
{
28
 
 
29
26
String *Item_func_insert::val_str(String *str)
30
27
{
31
28
  assert(fixed == 1);
42
39
      args[3]->null_value)
43
40
    goto null;
44
41
 
45
 
  if ((start < 0) || (start > static_cast<int64_t>(res->length())))
 
42
  if ((start < 0) || (start > res->length()))
46
43
    return res;                                 // Wrong param; skip insert
47
 
  if ((length < 0) || (length > static_cast<int64_t>(res->length())))
 
44
  if ((length < 0) || (length > res->length()))
48
45
    length= res->length();
49
46
 
50
47
  /* start and length are now sufficiently valid to pass to charpos function */
52
49
   length= res->charpos((int) length, (uint32_t) start);
53
50
 
54
51
  /* Re-testing with corrected params */
55
 
  if (start > static_cast<int64_t>(res->length()))
 
52
  if (start > res->length())
56
53
    return res;
57
 
  if (length > static_cast<int64_t>(res->length()) - start)
 
54
  if (length > res->length() - start)
58
55
    length= res->length() - start;
59
56
 
60
57
  if ((uint64_t) (res->length() - length + res2->length()) >
61
 
      (uint64_t) session.variables.max_allowed_packet)
 
58
      (uint64_t) current_session->variables.max_allowed_packet)
62
59
  {
63
 
    push_warning_printf(&session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
 
60
    push_warning_printf(current_session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
64
61
                        ER_WARN_ALLOWED_PACKET_OVERFLOWED,
65
62
                        ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED),
66
 
                        func_name(), session.variables.max_allowed_packet);
 
63
                        func_name(), current_session->variables.max_allowed_packet);
67
64
    goto null;
68
65
  }
69
66
  res=copy_if_not_alloced(str,res,res->length());
91
88
  }
92
89
  max_length= (ulong) max_result_length;
93
90
}
94
 
 
95
 
} /* namespace drizzled */