bk commit into 4.1 tree (andrey:1.2555)

[ahristov]

Below is the list of changes that have just been committed into a local
4.1 repository of andrey. When andrey 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, 2006-10-11 11:04:45+02:00, andrey@stripped +1 -0
  Fix a typo regarding checking whether HA_VAR_LENGTH_KEY is
  set. This has always worked because when flag is !=0 then
  HA_VAR_LENGTH_KEY is always set. Therefore, a test case cannot
  reveal a faulty behavior.

  myisam/sort.c@stripped, 2006-10-11 11:04:40+02:00, andrey@stripped +2 -2
    fix typo. Nevertheless, it has worked as expected
    because when a bit in flag is set HA_VAR_LENGTH_KEY has
    been always set too. Actually, no problem exposed through
    DDL.

# 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:	andrey
# Host:	example.com
# Root:	/work/bug23074/my41-bug23074

--- 1.46/myisam/sort.c	2006-10-11 11:04:53 +02:00
+++ 1.47/myisam/sort.c	2006-10-11 11:04:53 +02:00
@@ -324,7 +324,7 @@ pthread_handler_decl(thr_find_all_keys,a
   if (info->sort_info->got_error)
     goto err;
 
-  if (info->keyinfo->flag && HA_VAR_LENGTH_KEY)
+  if (info->keyinfo->flag & HA_VAR_LENGTH_KEY)
   {
     info->write_keys=write_keys_varlen;
     info->read_to_buffer=read_to_buffer_varlen;
@@ -513,7 +513,7 @@ int thr_write_keys(MI_SORT_PARAM *sort_p
   {
     if (got_error)
       continue;
-    if (sinfo->keyinfo->flag && HA_VAR_LENGTH_KEY)
+    if (sinfo->keyinfo->flag & HA_VAR_LENGTH_KEY)
     {
       sinfo->write_keys=write_keys_varlen;
       sinfo->read_to_buffer=read_to_buffer_varlen;