into  gleb.loc:/home/uchum/work/bk/5.1-opt

into  gleb.loc:/home/uchum/work/bk/5.1-opt

into  mysql.com:/home/hf/work/27405/my51-27405

into  kindahl-laptop.dnsalias.net:/home/bk/fix-mysql-5.1-rpl

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

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

into  dl145s.mysql.com:/data0/mhansson/my50-bug28570

standards (and help Doxygen generating good documentation).

(and be more friendly to Doxygen by removing unnecessary typedefs).

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.0-merge

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-4.1-merge

The bug caused memory corruption for some queries with top OR level
in the WHERE condition if they contained equality predicates and 
other sargable predicates in disjunctive parts of the condition.

The corruption happened because the upper bound of the memory
allocated for KEY_FIELD and SARGABLE_PARAM internal structures
containing info about potential lookup keys was calculated incorrectly
in some cases. In particular it was calculated incorrectly when the
WHERE condition was an OR formula with disjuncts being AND formulas
including equalities and other sargable predicates.

  Post fix for the bug#29948.

into  dl145s.mysql.com:/data0/mhansson/my51-bug28570

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  moonbone.local:/mnt/gentoo64/work/29948-bug-5.0-opt-mysql

The cli_read_binary_rows function is used to fetch data from the server
after a prepared statement execution. It accepts a statement handler and gets
the connection handler from it. But when the auto-reconnect option is set
the connection handler is reset to NULL after reconnection because the
prepared statement is lost and the handler became useless. This case
wasn't checked in the cli_read_binary_rows function and caused server crash.

Now the cli_read_binary_rows function checks the connection handler to be
not NULL and returns an error if it is.

into  gleb.loc:/home/uchum/work/bk/5.1-opt

into  gleb.loc:/home/uchum/work/bk/5.1-opt

into  gleb.loc:/home/uchum/work/bk/5.0-opt

into  synthia.local:/home/mydev/mysql-5.1-axmrg

into  synthia.local:/home/mydev/mysql-5.1-axmrg

into  synthia.local:/home/mydev/mysql-5.0-axmrg

into  synthia.local:/home/mydev/mysql-5.0-axmrg

into  synthia.local:/home/mydev/mysql-4.1-axmrg

into  mysql.com:/home/ksm/commits/mysql-5.1-new-rpl

into  gleb.loc:/home/uchum/work/bk/5.1-opt

into  mysql.com:/data2/mysql-5.1-new-rpl-30128-30209