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

when one connection had done FLUSH TABLES WITH READ LOCK, some updates, and then COMMIT,
it was accepted but my_error() was called and so, while client got no error, error was logged in binlog.
We now don't call my_error() in this case; we assume the connection know what it does.
This problem was specific to 4.0.21. The change is needed to make replication work with existing versions of innobackup.

(Fixed this by backporting some logic from 4.1)

in the error monitor thread.  (Bug #5898)

into build.mysql.com:/users/rburnett/mysql-4.0

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

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

Cleaned up patch for checking locks for multi-table updates

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

Recusive part leads to stack overflow

into hundin.mysql.fi:/home/marko/k/mysql-4.0

into hundin.mysql.fi:/home/marko/k/mysql-4.0

into sinisa.nasamreza.org:/mnt/work/mysql-4.0

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

into mysql.com:/home/mydev/mysql-4.0-bug4286

Original code was checking ! unix_socket for local_file flag.  This doesn't work and so was removed.  Now
to import a local file, you must use the --local command line option.

mysqlimport.c:
  Removed check of unix_socket to set local_file

Bug #5492 
"set @@session.read_rnd_buffer_size=33554432" crashes server on query

1. added warning comments for uint3korr (need one more byte allocated)
2. unsigned long in uint3korr was replaced by unsigned int to 
   avoid problems on 64-bits platforms
3. shorten warning comments in init_rr_cache in sql/records.cc

into eagle.mysql.r18.ru:/home/vva/work/BUG_5492/mysql-4.0

into hundin.mysql.fi:/home/marko/k/mysql-4.0

into ltantony.rdg.cyberkinetica.homeunix.net:/usr/home/antony/work/bug4118

into ltantony.rdg.cyberkinetica.homeunix.net:/usr/home/antony/work/bug4118

  Ensures that WRITE lock is not obtained on all tables referenced.

  A fix (bug #5733: Table handler error with self-join multi-table DELETE).
records.cc:
  A fix (bug #5733: Table handler error with self-join multi-table DELETE).

into build.mysql.com:/users/rburnett/mysql-4.0

into mysql.com:/home/dlenev/src/mysql-4.0-bg4131-3

using GROUP BY"
Now we are setting Field_timestamp::field_length to 19 in open_table()
if we are in new mode (and we are restoring it back when we are coming
back to normal mode). This also should solve potential problems with
some of LOAD DATA INFILE and SELECT * INTO in this mode.

(part of BUG#5379)

old options for include path and library settings still
work for backwards compatibility
(fix for BUG #5494)

sql_show.cc:
  Made change suggested by Serge. REmoved else in mysql_find_files so symlink files fall through to the wildcard check

BUG#4335 - one name can be handler open'ed many times.
Reworked the HANDLER functions and interface.
Using a HASH to store information on open tables that
survives FLUSH TABLE.
HANDLER tables alias names must now be unique, though it
is allowed in 4.0 to qualify them with the database name
of the base table.

we force the message to the error log, and we make it more informative;
we treat EDQUOT like ENOSPC.

sql_show.cc:
  Added wild card check to symdir block in mysql_find_files

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

  Added #ifdef around is_set in os_aio_print