- heuristic => optimizer_prune_level
- plan_search_depth => optimizer_search_depth

in tests after the last 4.1->5.0 merge, and:
*** The same as ChangeSet@1.1822.1.1, 2004-05-14 23:08:03+02:00, guilhem@mysql.com of MySQL 4.0 ***
  Replication testsuite: making the master-slave synchronization less likely to fail,
  by adding sleep-and-retries (max 4 times) if MASTER_POS_WAIT() returns NULL
  in sync_with_master and sync_slave_with_master.
  The problem showed up only today, in MySQL 5.0 in rpl_server_id2.test,
  but may affect 4.x as well, so I fixed 4.x too. Note that I am also fixing
  5.0, with the same exact patch, because I don't want to leave 5.0 broken
  until the next 4.0->4.1->5.0 merge.

Note: One sp.test still fails (prime), and rpl_server_id2.test fails (will be fixed by guilhem ASAP).

into sanja.is.com.ua:/home/bell/mysql/bk/work-parser-5.0

consisting of pos-review fixes and improvements.

  Czech collations were renamed to _cs
Index.xml:
  Czech collation were renamed to _cs

Portablity fix for system with case insenstive table names. (Without this ALTER TABLE can fail for InnoDB)

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

Change strtoll -> my_strtoll10()
Fixed bug in my_strntoul() and my_strntol() where we got different values on 32 and 64 bit systems (Bug #3472)

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

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

item_list for fake_select will be created only once
(problem reported by valgrind in test_union2 fixed)

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

   that was accidently added by the last BK auto 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).