into  linux-st28.site:/home/martin/mysql/src/bug28570/my51-bug28570

ORDER BY is used

The range analysis module did not correctly signal to the 
handler that a range represents a ref (EQ_RANGE flag). This causes 
non-range queries like 
SELECT ... FROM ... WHERE keypart_1=const, ..., keypart_n=const 
ORDER BY ... FOR UPDATE
to wait for a lock unneccesarily if another running transaction uses
SELECT ... FOR UPDATE on the same table.

Fixed by setting EQ_RANGE for all range accesses that represent 
an equality predicate. 

into  magare.gmz:/home/kgeorge/mysql/work/B29536-5.1-opt

MySQL replicates the time zone only when operations that involve
it are performed. This is controlled by a flag. But this flag
is set only on successful operation.
The flag must be set also when there is an error that involves
a timezone (so the master would replicate the error to the slaves). 

Fixed by moving the setting of the flag before the operation
(so it apples to errors as well).

into  olga.mysql.com:/home/igor/mysql-5.1-opt

a problem for BIT type values different from the one reported for the bug.

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-bug30219

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-bug30219

This bug manifested itself for queries with grouping by columns of
the BIT type. It led to wrong comparisons of bit-field values and
wrong result sets.
Bit-field values never cannot be compared as binary values. Yet
the class Field_bit had an implementation of the cmp method that
compared bit-fields values as binary values. 
Also the get_image and set_image methods of the base class Field 
cannot be used for objects of the Field_bit class. 
Now these methods are declared as virtual and specific implementations
of the methods are provided for the class Field_bit.

   merged 5.1-main to 5.1-opt : error numbers changed.
Many files:
   merged 5.1-main to 5.1-opt : error numbers changed
rpl_extraCol_innodb.result:
  merged 5.1-main to 5.1-opt : error numbers changed

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-merge

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.0-opt-merge

into  mysql_cab_desk.:C:/source/c++/mysql-5.0-rpl

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-2team

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.0-2team

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-2team

  Rename: BitKeeper/deleted/.del-readme.txt -> BitKeeper/deleted/.del-readme.txt-grumble-grumble

into  olga.mysql.com:/home/igor/dev-opt/mysql-5.1-opt-bug28404

into  dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rpl

into  magare.gmz:/home/kgeorge/mysql/work/B25228-5.1-opt

into  magare.gmz:/home/kgeorge/mysql/work/B25228-5.1-opt

into  mysql.com:/home/bar/mysql-work/mysql-5.1.b28875

A test case was waiting for a fixed number of seconds for a specific 
state of the slave IO thread to take place.
Fixed by waiting in a loop for that specific thread state instead 
(or timeout).

into  bk-internal.mysql.com:/users/gshchepa/5.1-opt

  Post-merge fix.

into  mysql.com:/home/bar/mysql-work/mysql-5.0-rpl

(Regression, caused by a patch for the bug 22646).
Problem: when result type of date_format() was changed from
binary string to character string, mixing date_format()
with a ascii column in CONCAT() stopped to work.
Fix:
- adding "repertoire" flag into DTCollation class,
to mark items which can return only pure ASCII strings.
- allow character set conversion from pure ASCII to other character sets.

  Post-merge fix.

into  magare.gmz:/home/kgeorge/mysql/autopush/B30193-5.0-opt

into  magare.gmz:/home/kgeorge/mysql/work/B30193-5.1-opt