into serg.mylan:/usr/home/serg/Abk/mysql-4.1

into mysql.com:/home/mydev/mysql-4.1-bug6151

into mysql.com:/space/my/mysql-4.1

  Correcting problem with merge

into goetia.(none):/home/dellis/mysqlab/bk/mysql-4.1

into mysql.com:/home/mydev/mysql-4.1-bug6151

into mysql.com:/media/sda1/mysql/mysql-4.1-6088

function crashes server" with main tree.

prepared statements when LIMIT is used" and post-review comments.
The fix changes the approach we calculate the need for ORDER BY 
in UNION: the previous was not PS friendly, as it damaged SELECT_LEX 
options in case of single select.

  BUG #5831  Post-review changes, merging improvements from Monty.

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

into mysql.com:/home/dlenev/src/mysql-4.1-bg6081

into mysql.com:/home/my/mysql-4.1

into mysql.com:/home/dlenev/src/mysql-4.1-tzfix

into serg.mylan:/usr/home/serg/Abk/mysql-4.1

server" with main tree.

into mysql.com:/home/dlenev/src/mysql-4.1-tzfix

into mysql.com:/build/mysqldev/my/mysql-4.1-tomastest

into mysql.com:/users/kboortz/daily/work/mysql-4.1-sjis

Fixed checking of privilege handling in CREATE ... SELECT (Bug #6094)

crashes server"

(in 4.0 we fix only connection stalling in case of error, crash itself is
fixed in 4.1, the test case for this code is also there).

into poseidon.ndb.mysql.com:/home/tomas/mysql-4.1-ndb

into mysql.com:/home/mydev/mysql-4.1-bug6151