← Back to branch summary

~james-page/ubuntu/precise/mysql-5.5/misc-fixes

« back to all changes in this revision

Viewing changes to sql/field.cc

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-06-11 07:34:33 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20120611073433-l9za2ni4ipp848y3
Tags: 5.5.24-0ubuntu0.12.04.1
https://launchpad.net/bugs/1011371
* SECURITY UPDATE: Update to 5.5.24 to fix security issues (LP: #1011371)
  - http://dev.mysql.com/doc/refman/5.5/en/news-5-5-24.html

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/field.cc
8257
8257
  ulonglong tmp=(ulonglong) Field_enum::val_int();
8258
8258
  uint bitnr=0;
8259
8259
 
 
8260
  if (tmp == 0)
 
8261
  {
 
8262
    /*
 
8263
      Some callers expect *val_buffer to contain the result,
 
8264
      so we assign to it, rather than doing 'return &empty_set_string.
 
8265
     */
 
8266
    *val_buffer= empty_set_string;
 
8267
    return val_buffer;
 
8268
  }
 
8269
 
 
8270
  val_buffer->set_charset(field_charset);
8260
8271
  val_buffer->length(0);
8261
 
  val_buffer->set_charset(field_charset);
 
8272
 
8262
8273
  while (tmp && bitnr < (uint) typelib->count)
8263
8274
  {
8264
8275
    if (tmp & 1)