into mysql.com:/dbdata/psergey/mysql-4.1-ps-merge

into mysql.com:/home/pem/work/mysql-4.1

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

   files, fixed linking of myisam_ftdump

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

Fixed wrong key usage which caused wrong result for some "WHERE primary_key=constant" queries where MySQL could use 'only index' (Bug #3666)
The bug was introduced in a patch in the 4.1.2 source tree.

into mysql.com:/dbdata/psergey/mysql-4.1-code-cleanup

into sanja.is.com.ua:/home/bell/mysql/bk/work-ndb-4.1

as the I/O thread filters on the server id, we must test replicate_same_server_id in it (on top of in the SQL thread).

into mysql.com:/home/mysql_src/mysql-4.0

very minor changes: a STOP SLAVE in a replication test to get rid of a non critical message in slave.err,
and a comment update

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

into sanja.is.com.ua:/home/bell/mysql/bk/work-ndb-4.1

SQL_SELECT_LIMIT as default will be applied only for SELECT statement if there was not explicit LIMIT clause
correct table list passed to class constructor of select_update

Make Item_param::val_int and Item_param::val_str follow the used convention and return 0 if null_value==1.

into hegel.local:/home/miguel/bk/mysql-4.1

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

We didn't use 'only index' for tables of type 'const'. (Bug #3497)

(Bug #3596)

into hundin.mysql.fi:/home/marko/l/mysql-4.0