sql/log.cc:
  Merge from 4.1

sql/log.cc:
  Setting error code to 0 on SQL statements that cannot fail.

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

mysql-test/r/binlog.result:
  binlog rotation after a big transation
mysql-test/r/rpl_rotate_logs.result:
  innodb-dependent test removed
mysql-test/t/binlog.test:
  binlog rotation after a big transation
mysql-test/t/rpl_rotate_logs.test:
  innodb-dependent test removed

into snake-hub.snake.net:/src/extern/MySQL/bk/mysql-5.0

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


sql/log_event.cc:
  Auto merged

into mysql.com:/home/mysql_src/mysql-5.0-xa

pushed some minutes ago)



mysql-test/r/ctype_ucs.result:
  result fix
mysql-test/r/mysqlbinlog.result:
  result fix
mysql-test/r/mysqlbinlog2.result:
  result fix
mysql-test/r/rpl_charset.result:
  result fix
mysql-test/r/user_var.result:
  result fix

mysql-test/r/rpl_insert_id.result:
  Auto merged
mysql-test/t/rpl_insert_id.test:
  Auto merged
sql/log.cc:
  Merge from 4.0

into mysql.com:/home/timka/mysql/src/5.0-bug-8576

This fix addresses a bug of the HPUX C++ compiler, in the way it uses registers.
As result, the last comparison of the variable 'result' failed, and next_prefix()
looped forever.


sql/opt_range.cc:
  - fix for BUG#8576
  - updated function name in DBUG_ENTER

into mysql.com:/home/bk/b8412-mysql-4.0

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


sql/log.cc:
  Auto merged
sql/sql_class.h:
  Auto merged

auto-end-rollback in case crashed binlog) which cannot hurt.


client/mysqlbinlog.cc:
  safety measures (completion_type, crashed binlog)

  cast sql_mode to ulonglong before int8store, otherwise the implementation of int8store
  based on >> complains that we do 32-bit var >> 32 which is undefined according to C standard.
  (compiler warning appeared on SGI Irix)


sql/log_event.cc:
  cast sql_mode to ulonglong before int8store, otherwise the implementation of int8store
  based on >> complains that we do 32-bit var >> 32 which is undefined according to C standard.
  (compiler warning appeared on SGI Irix)

into mysql.com:/home/mysql_src/mysql-5.0-xa


sql/lock.cc:
  Auto merged

correct end_log_pos for Xid_log_event


mysql-test/r/binlog.result:
  don't depend on the previous tests
mysql-test/r/rpl_rotate_logs.result:
  correct end_log_pos for Xid_log_event
mysql-test/t/binlog.test:
  don't depend on the previous tests
sql/handler.h:
  comment
sql/log_event.cc:
  advance position for Xid
sql/log_event.h:
  comment
sql/sql_class.h:
  correct end_log_pos for Xid_log_event
sql/sql_parse.cc:
  make sure commit handler knows whether it's autocommit or not

into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0

into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0


mysql-test/r/warnings.result:
  Auto merged
mysql-test/t/warnings.test:
  Auto merged
sql/protocol.cc:
  Auto merged

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

1) If my.cnf is found in datadir and basedir, give a warning and use the
   one in basedir.
2) If my.cnf is found in datadir, use it, but give a warning.
3) No warning if my.cnf is in basedir.

start_waiting_global_read_lock() should wake up all those who are waiting
for protect_against_global_read_lock to go down to 0: those registered in waiting_for_read_lock
AND those registered in global_read_lock_blocks_commit.


sql/lock.cc:
  start_waiting_global_read_lock() should wake up all those who are waiting
  for protect_against_global_read_lock to go down to 0: those registered in waiting_for_read_lock
  AND those registered in global_read_lock_blocks_commit.

into gluh.mysql.r18.ru:/home/gluh/MySQL-MERGE/mysql-5.0


mysql-test/r/func_str.result:
  Auto merged
mysql-test/t/func_str.test:
  Auto merged
sql/item_strfunc.cc:
  Auto merged

into mysql.com:/usr/home/bar/mysql-5.0.fresh

into mysql.com:/home/timka/mysql/src/5.0-bug-8576

new tests


mysql-test/r/innodb.result:
  savepoint test
mysql-test/t/innodb.test:
  savepoint test
sql/log.cc:
  write "COMMIT" into binlog if there's no Xid at the end of transaction

include/config-win.h:
  Auto merged
myisam/myisamchk.c:
  Auto merged
mysys/errors.c:
  Auto merged
include/mysys_err.h:
  Merge from 4.1, attempt#2.

into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0


sql/sql_class.h:
  Auto merged

into mysql.com:/home/timka/mysql/src/5.0-bug-8576


sql/opt_range.cc:
  Auto merged

into gluh.mysql.r18.ru:/home/gluh/MySQL/mysql-5.0

into mysql.com:/usr/home/bar/mysql-4.1

  Activate Unicode collations in Windows version.


include/config-win.h:
  Activate Unicode collations in Windows version.

        bug #7215: information_schema: columns are longtext instead of varchar

The problem was in different representations of double variables depending on
platform/compiler/compile options. In some cases double variables are represented by
64 bits (while in memory), or by 80 bits (while in FPU register). As a result equal
values are not considered "==". As many sources point out,  doubles should not be
compared by '==' for this reason. This fix subtracts the scaled minimal double
value X such that 1 + X != 1, to ensure that the inequality holds in any case.


sql/opt_range.cc:
  Do not compare double values with == because they may have different representations.

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

ndb/src/kernel/main.cpp:
  merge