innobase/btr/btr0btr.c:
  Update links to the user manual
innobase/buf/buf0buf.c:
  Update links to the user manual
innobase/dict/dict0dict.c:
  Update links to the user manual
innobase/fsp/fsp0fsp.c:
  Update links to the user manual
innobase/log/log0log.c:
  Update links to the user manual
innobase/log/log0recv.c:
  Update links to the user manual
innobase/os/os0file.c:
  Update links to the user manual
innobase/row/row0mysql.c:
  Update links to the user manual
innobase/ut/ut0dbg.c:
  Update links to the user manual

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.

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.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

(Jani's CS 1.1675 04/01/05 21:45:14 was adapted an aplied).


client/mysql.cc:
  A fix (bug #2205 USE database doesn't work after DROP database + CREATE database).

BitKeeper/etc/ignore:
  Added support-files/my-innodb-heavy-4G.cnf to the ignore list
mysql-test/r/union.result:
  drop table added
mysql-test/t/union.test:
  drop table added

  Allow FROM or IN in SHOW KEYS, as in other SHOW statements.


sql/sql_yacc.yy:
  Allow FROM or IN in SHOW KEYS, as in other SHOW statements.

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


sql/sql_select.cc:
  Auto merged

  Added a test case for bug #5333.
null_key.result, key_primary.result:
  Made covering index usable for const tables.
sql_select.cc:
  Made covering index usable for const tables:
  downported the corresponding code from 4.1.
  Simultaneously fixed bug #5333 reported for 4.1.
  The bug was due to the fact that field index in join
  structures was always set to 0 for const tables.


sql/sql_select.cc:
  Made covering index usable for const tables:
  downported the corresponding code from 4.1.
  Simultaneously fixed bug #5333 reported for 4.1.
  The bug was due to the fact that field index in join
  structures was always set to 0 for const tables.
mysql-test/t/select.test:
  Added a test case for bug #5333.
mysql-test/r/key_primary.result:
  Made covering index usable for const tables.
mysql-test/r/null_key.result:
  Made covering index usable for const tables.
mysql-test/r/select.result:
  Added a test case for bug #5333.

  Add GPL comment


sql/share/czech/errmsg.txt:
  Add GPL comment
sql/share/danish/errmsg.txt:
  Add GPL comment
sql/share/dutch/errmsg.txt:
  Add GPL comment
sql/share/english/errmsg.txt:
  Add GPL comment
sql/share/estonian/errmsg.txt:
  Add GPL comment
sql/share/french/errmsg.txt:
  Add GPL comment
sql/share/german/errmsg.txt:
  Add GPL comment
sql/share/greek/errmsg.txt:
  Add GPL comment
sql/share/hungarian/errmsg.txt:
  Add GPL comment
sql/share/italian/errmsg.txt:
  Add GPL comment
sql/share/japanese/errmsg.txt:
  Add GPL comment
sql/share/korean/errmsg.txt:
  Add GPL comment
sql/share/norwegian-ny/errmsg.txt:
  Add GPL comment
sql/share/norwegian/errmsg.txt:
  Add GPL comment
sql/share/polish/errmsg.txt:
  Add GPL comment
sql/share/portuguese/errmsg.txt:
  Add GPL comment
sql/share/romanian/errmsg.txt:
  Add GPL comment
sql/share/russian/errmsg.txt:
  Add GPL comment
sql/share/slovak/errmsg.txt:
  Add GPL comment
sql/share/spanish/errmsg.txt:
  Add GPL comment
sql/share/swedish/errmsg.txt:
  Add GPL comment
sql/share/ukrainian/errmsg.txt:
  Add GPL comment

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

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

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

BitKeeper/deleted/.del-errmsg.OLD~de59ad17392012d:
  Delete: sql/share/swedish/errmsg.OLD

  If ALTER TABLE ... DROP FOREIGN KEY ... fails because of a wrong constraint name, return a table handler error number 150 instead of 152; the value 152 was misleading, as it referred to '152 = Cannot delete a parent row', whereas '150 = Foreign key constraint is incorrectly formed' is less misleading


sql/ha_innodb.cc:
  If ALTER TABLE ... DROP FOREIGN KEY ... fails because of a wrong constraint name, return a table handler error number 150 instead of 152; the value 152 was misleading, as it referred to '152 = Cannot delete a parent row', whereas '150 = Foreign key constraint is incorrectly formed' is less misleading