bk commit into 5.0 tree (tomas:1.2366) BUG#25746

[tomas]

Below is the list of changes that have just been committed into a local
5.0 repository of tomas. When tomas 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
  1.2366 07/01/23 07:12:03 tomas@stripped +1 -0
  bug#25746 ndb: 4209 error with 2 VARCHAR primary keys
  - post review changes

  sql/ha_ndbcluster.cc
    1.296 07/01/23 07:11:53 tomas@stripped +1 -1
    bug#25746 ndb: 4209 error with 2 VARCHAR primary keys
    - post review changes

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.mysql.com
# Root:	/home/tomas/mysql-5.0-ndb

--- 1.295/sql/ha_ndbcluster.cc	2007-01-23 00:33:54 +07:00
+++ 1.296/sql/ha_ndbcluster.cc	2007-01-23 07:11:53 +07:00
@@ -3144,7 +3144,7 @@
       size_t len = key_part->length;
       const byte * ptr = record + key_part->offset;
       Field *field = key_part->field;
-      if (unlikely(field->type() ==  MYSQL_TYPE_VARCHAR))
+      if (field->type() ==  MYSQL_TYPE_VARCHAR)
       {
         if (((Field_varstring*)field)->length_bytes == 1)
         {