← Back to branch summary

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

« back to all changes in this revision

Viewing changes to drizzled/function/str/repeat.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/repeat.cc
84
84
    return res;
85
85
  length=res->length();
86
86
  // Safe length check
87
 
  if (length > current_session->variables.max_allowed_packet / (uint) count)
 
87
  if (length > session.variables.max_allowed_packet / (uint) count)
88
88
  {
89
 
    push_warning_printf(current_session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
 
89
    push_warning_printf(&session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
90
90
                        ER_WARN_ALLOWED_PACKET_OVERFLOWED,
91
91
                        ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED),
92
 
                        func_name(), current_session->variables.max_allowed_packet);
 
92
                        func_name(), session.variables.max_allowed_packet);
93
93
    goto err;
94
94
  }
95
95
  tot_length= length*(uint) count;