List:Commits« Previous MessageNext Message »
From:mhansson Date:December 14 2007 12:33pm
Subject:bk commit into 5.1 tree (mhansson:1.2588) BUG#32798
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of martin. When martin does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-12-14 13:33:39+01:00, mhansson@stripped +1 -0
  Bug#32798:Post-merge fix

  sql/item_sum.cc@stripped, 2007-12-14 13:33:34+01:00, mhansson@stripped +1 -1
    Bug#32798:Post-merge fix

diff -Nrup a/sql/item_sum.cc b/sql/item_sum.cc
--- a/sql/item_sum.cc	2007-12-14 12:40:35 +01:00
+++ b/sql/item_sum.cc	2007-12-14 13:33:34 +01:00
@@ -2931,7 +2931,7 @@ int group_concat_key_cmp_with_order(void
       int res;
       uint offset= (field->offset(field->table->record[0]) -
                     table->s->null_bytes);
-      if ((res= field->cmp(key1 + offset, key2 + offset)))
+      if ((res= field->cmp((uchar*)key1 + offset, (uchar*)key2 + offset)))
         return (*order_item)->asc ? res : -res;
     }
   }
Thread
bk commit into 5.1 tree (mhansson:1.2588) BUG#32798mhansson14 Dec