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

into deer.(none):/home/hf/work/mysql-4.1.stmt

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

into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.1

into eagle.mysql.r18.ru:/home/vva/work/BUG_1323/mysql-4.1

Changed Rotate_log_event::exec_event() to not increment positions when the
event is seen in the middle of a transaction.

  Query cache now takes in account character_set_results and collation_connection

Portuguese and Swedish are not affected (they were already translated).

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

correcting it now. Thanks Dmitri for spotting this.

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

When an update query is to be written to the binlog, and it reads unset
user variables (example: INSERT INTO t VALUEs(@A) where @A does not exist),
we create the variable like if it had been set with SET before, and we loop
(i.e. we redo the steps of logging, now that the variable exists).

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

into deer.(none):/home/hf/work/mysql-4.1.stmt

there was an error about sendind prepared parameters to the server

  Stupid typo. Led to compilation failure with non-gcc compilers.

handling of init-file option added to embedded library
main problem was killing of output (resulting recordsets etc)
i added checks for empty output in Protocol:: methods
better solution could be special Protocol_nul class to redirect
results to nowhere

I made libmysqld not to do freopen(stdout...)
I think we need better solution here so i added it as a worklog entry #1247

into deer.(none):/home/hf/work/mysql-4.1.stmt

into eagle.mysql.r18.ru:/home/vva/work/help_correction/mysql-4.1

into eagle.mysql.r18.ru:/home/vva/work/help_correction/mysql-4.1

embedded library
some fixes - cleanup procedure changed for embedded library - deletion of
embedded mysql->thd

WL604 Privilegies in embedded library
another bug fixed

into deer.(none):/home/hf/work/mysql-4.1.stmt

WL#604 Privileges in embedded library
bugs fixed

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

   if a variable is not defined (empty).

   (crc32.c is included by mysys/my_crc32.c)

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

Don't free the client's selected db (thd->db) when it has been DROPped,
if this is a slave thread; the x_free() was causing a lot
of various bugs in rpl_loaddata_rule_m (garbage characters, segfault, hangs in
other threads).
A small post-merge fix (rli->inside_transaction exists in 4.0 only).