← Back to branch summary

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

« back to all changes in this revision

Viewing changes to drizzled/function/str/pad.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/pad.cc
91
91
  pad_char_length= rpad->numchars();
92
92
 
93
93
  byte_count= count * collation.collation->mbmaxlen;
94
 
  if ((uint64_t) byte_count > current_session->variables.max_allowed_packet)
 
94
  if ((uint64_t) byte_count > session.variables.max_allowed_packet)
95
95
  {
96
 
    push_warning_printf(current_session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
 
96
    push_warning_printf(&session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
97
97
                        ER_WARN_ALLOWED_PACKET_OVERFLOWED,
98
98
                        ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED),
99
 
                        func_name(), current_session->variables.max_allowed_packet);
 
99
                        func_name(), session.variables.max_allowed_packet);
100
100
    goto err;
101
101
  }
102
102
  if (args[2]->null_value || !pad_char_length)
196
196
  pad_char_length= pad->numchars();
197
197
  byte_count= count * collation.collation->mbmaxlen;
198
198
 
199
 
  if ((uint64_t) byte_count > current_session->variables.max_allowed_packet)
 
199
  if ((uint64_t) byte_count > session.variables.max_allowed_packet)
200
200
  {
201
 
    push_warning_printf(current_session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
 
201
    push_warning_printf(&session, DRIZZLE_ERROR::WARN_LEVEL_WARN,
202
202
                        ER_WARN_ALLOWED_PACKET_OVERFLOWED,
203
203
                        ER(ER_WARN_ALLOWED_PACKET_OVERFLOWED),
204
 
                        func_name(), current_session->variables.max_allowed_packet);
 
204
                        func_name(), session.variables.max_allowed_packet);
205
205
    goto err;
206
206
  }
207
207