← Back to branch summary

~ubuntu-branches/ubuntu/trusty/drizzle/trusty

« back to all changes in this revision

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

  • Committer: Bazaar Package Importer
  • Author(s): Monty Taylor
  • Date: 2010-10-02 14:17:48 UTC
  • mfrom: (1.1.1 upstream)
  • mto: (2.1.17 sid)
  • mto: This revision was merged to the branch mainline in revision 3.
  • Revision ID: james.westby@ubuntu.com-20101002141748-m6vbfbfjhrw1153e
Tags: 2010.09.1802-1
* New upstream release.
* Removed pid-file argument hack.
* Updated GPL-2 address to be new address.
* Directly copy in drizzledump.1 since debian doesn't have sphinx 1.0 yet.
* Link to jquery from libjs-jquery. Add it as a depend.
* Add drizzled.8 symlink to the install files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/function/str/replace.cc
86
86
            if (*i++ != *j++) goto skip;
87
87
          offset= (int) (ptr-res->ptr());
88
88
          if (res->length()-from_length + to_length >
89
 
              current_session->variables.max_allowed_packet)
 
89
              session.variables.max_allowed_packet)
90
90
          {
91
 
            push_warning_printf(current_session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
 
91
            push_warning_printf(&session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
92
92
                                ER_WARN_ALLOWED_PACKET_OVERFLOWED,
93
93
                                ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED),
94
94
                                func_name(),
95
 
                                current_session->variables.max_allowed_packet);
 
95
                                session.variables.max_allowed_packet);
96
96
 
97
97
            goto null;
98
98
          }
114
114
    do
115
115
    {
116
116
      if (res->length()-from_length + to_length >
117
 
          current_session->variables.max_allowed_packet)
 
117
          session.variables.max_allowed_packet)
118
118
      {
119
 
        push_warning_printf(current_session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
 
119
        push_warning_printf(&session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
120
120
                            ER_WARN_ALLOWED_PACKET_OVERFLOWED,
121
121
                            ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED), func_name(),
122
 
                            current_session->variables.max_allowed_packet);
 
122
                            session.variables.max_allowed_packet);
123
123
        goto null;
124
124
      }
125
125
      if (!alloced)