← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Stewart Smith
  • Date: 2010-08-05 16:41:55 UTC
  • mfrom: (1638.9.13)
  • mto: (1720.1.1 drizzle)
  • mto: This revision was merged to the branch mainline in revision 1721.
  • Revision ID: stewart@flamingspork.com-20100805164155-7olu6iv6rwoxfsne
Merged store-foreign-key-in-table-proto into show-create-table-using-table-message.

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