← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/mysql-5.1/oneiric-updates

« back to all changes in this revision

Viewing changes to sql/item_cmpfunc.cc

  • Committer: Bazaar Package Importer
  • Author(s): Norbert Tretkowski
  • Date: 2011-07-17 17:26:27 UTC
  • mfrom: (1.3.8 upstream)
  • mto: This revision was merged to the branch mainline in revision 27.
  • Revision ID: james.westby@ubuntu.com-20110717172627-6ml4e6l16adhecmy
Tags: 5.1.58-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
sql/item_cmpfunc.cc
4000
4000
      uint j=0;
4001
4001
      for (uint i=1 ; i < arg_count ; i++)
4002
4002
      {
4003
 
        if (!args[i]->null_value)                       // Skip NULL values
4004
 
        {
4005
 
          array->set(j,args[i]);
4006
 
          j++;
4007
 
        }
4008
 
        else
4009
 
          have_null= 1;
 
4003
        array->set(j,args[i]);
 
4004
        if (!args[i]->null_value)                      // Skip NULL values
 
4005
          j++;
 
4006
        else
 
4007
          have_null= 1;
4010
4008
      }
4011
4009
      if ((array->used_count= j))
4012
4010
        array->sort();