into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0

into teton.kitebird.com:/home/paul/mysql-4.0

Fix bug when using option groups

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0

into mysql.sashanet.com:/reiser-data/mysql-4.0

Fix for --enable-local-infile
Portability fix for bison

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0

into co3064164-a.bitbike.com:/home/arjen/mysql-4.0

into teton.kitebird.com:/home/paul/mysql-4.0

of one of our users which replicates from a live server. So I now have a
lot of confidence in it and will push. It passes all tests, so I if I broke
somebody's code in 3.23 merge this is your fault - you should have had a good test
case :-)

overrun sentry in my_vsnprintf() test
will not be pushed yet

Fix problem with HAVING and MAX() IS NOT NULL

Let's hope this did not break anything. Will not push this one until Monty
gets back

into mysql.sashanet.com:/reiser-data/mysql-4.0

fixed replication bug - flush_master_info() needs to be called every time we read an 
    event from master

this is will not be pushed yet

into serg.mysql.com:/usr/home/serg/Abk/mysql-4.0

into sinisa.nasamreza.org:/mnt/hdc/Sinisa/mysql-4.0

into teton.kitebird.com:/home/paul/mysql-4.0