mysql-test/r/multi_update.result:
  multi* unique updating table check
mysql-test/t/multi_update.test:
  multi* unique updating table check
sql/sql_lex.cc:
  new method to check table only in subqueries
sql/sql_lex.h:
  new method to check table only in subqueries
sql/sql_parse.cc:
  used new method to check table only in subqueries
sql/sql_update.cc:
  check that table is unique added

into rurik.mysql.com:/home/igor/dev/mysql-4.1-0

  Added test case for bug #5406.
opt_sum.cc:
  Fixed bug #5406.


sql/opt_sum.cc:
  Fixed bug #5406.
mysql-test/r/func_group.result:
  Added test case for bug #5406.
mysql-test/t/func_group.test:
  Added test case for bug #5406.

mysql-test/r/rpl_set_charset.result:
  Auto merged
mysql-test/r/select.result:
  Auto merged
mysql-test/t/rpl_set_charset.test:
  Auto merged
mysql-test/t/select.test:
  Auto merged
sql/slave.cc:
  Auto merged

into rurik.mysql.com:/home/igor/dev/mysql-4.0-0

  Added newline at the end of file.


mysql-test/t/select.test:
  Added newline at the end of file.

BitKeeper/etc/ignore:
  auto-union
client/mysqlcheck.c:
  Auto merged
myisammrg/myrg_open.c:
  Auto merged
scripts/mysqld_safe.sh:
  Auto merged
sql/sql_analyse.cc:
  Auto merged

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

This does not fix any known bug, but is still a good idea.


sql/log_event.cc:
  when we update thd->db in replication, it's safer to update thd->db_length too.
sql/slave.cc:
  when we update thd->db in replication, it's safer to update thd->db_length too.
sql/sql_db.cc:
  comment

into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b2205

into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b2205

mysql-test/r/rpl_set_charset.result:
  result update
mysql-test/t/rpl_set_charset.test:
  clean up on slave too.

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


sql/sql_parse.cc:
  Auto merged

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

libmysql/libmysql.c:
  Code trimmed

into neptunus.(none):/home/magnus/mysql/mysql-4.1

mysql-test/r/ndb_insert.result:
  Add tests for duplicate keys in combination with start/end_bulk_insert
mysql-test/t/ndb_insert.test:
  Add tests for duplicate keys in combination with start/end_bulk_insert
sql/ha_ndbcluster.cc:
  Set my_errno if error occurs in end_bulk_insert

stack)
We just don't expect BIG buffer to be sent for just a double


libmysql/libmysql.c:
  We shouldn't fall if the buffer_length is bigger than 330

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

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

As I cannot be 100% sure that there won't be issues with some of our exotic platforms
(who knows if the charset of <obscure old OS> will play fair?), I'll send an email to the build guys.
Well, this holds if bk does not crash on binary chars of this cset.

into rhols221.adsl.netsonic.fi:/home/my/bk/mysql-4.0

FLOAT columns".

into gw.mysql.r18.ru:/usr/home/ram/work/4.0.b2631

sql/sql_table.cc:
  stupid me. error already exists in the function. Using a local 'int error' resulted in global 'error' not being inited, which probably made next steps (those testing global error) go wrong!

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


sql/log.cc:
  Auto merged

sql/log.cc:
  removing unneeded class Disable_binlog
sql/sql_class.h:
  removing unneeded class Disable_binlog
sql/sql_table.cc:
  As discussed, class Disable_binlog is removed and replaced by macros.

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

Dependency fix. We observed that doing any change to class THD in sql_class.h resulted in mysqld going crazy (parsing errors,
query cache errors in query_cache.test). This is because sql_yacc.cc depends on several .h files but those were not listed in
the dependencies of sql_yacc.o. The present patch does fix the issue; but my auto*-expert colleagues may have a better one.


sql/Makefile.am:
  sql_yacc.c includes mysql_priv.h, slave.h etc, so sql_yacc.o does depend on these .h files;
  so they need to be listed in the dependencies.

myisammrg/myrg_open.c:
  backport from 4.1
mysql-test/r/union.result:
  after merge fix
mysql-test/t/union.test:
  after merge fix
sql/log.cc:
  backward compatibility: inhibit severity labels in error log

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


mysql-test/r/union.result:
  Auto merged
mysql-test/t/union.test:
  Auto merged