BUG #5731 key_buffer_size not properly restricted to 4GB; use UINT_MAX32 for clarity.

  BUG #5731 Restrict key_buffer_size to 4GB on 64 bit platforms

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.

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

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

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

in net_printf(), we fill net->last_* variables for the slave SQL thread to know the error.

into mysql.com:/mnt/tmp/mysql-4.0-bug-myisampack

 * myisampack leaves key_file_length value from original table
 * myisamchk uses this value when calculating key file pointer length

  Fix initialization

other actions, as otherwise timestamps of "config.h.in" will 
cause re-run on compilation machine (fatal version problem!).

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

how to resolve stack trace documentation.

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

Changed the semantics of open_count so that it is decremented
at every unlock (if it was incremented due to data changes).
So it indicates a crash, if it is non-zero after a lock.
The table will then be repaired.

  We don't want the update to abort when IGNORE is specified

  Fix bug #5180: having a column prefix index in the primary key, and the same column fully in a secondary key could cause an assertion failure in row_build_row_ref()

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

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

  Correct the comment on the 'waiting' field in sync_cell_struct

  Improve the comment on stored_select_lock_type
ha_innodb.cc:
  Let InnoDB remember select_lock_type inside LOCK TABLES, also over plain consistent read SELECTs; fix Bug #5538 : assertion failure when using mysqldump with the -l option; in MERGING this patch to 4.1, there may be PROBLEMS; that is because previous patch was never merged to 4.1; Heikki Tuuri has to polish the code in 4.1 after this patch has been merged.

  Add more precise diagnostics about the state of the I/O threads of InnoDB; print in SHOW INNODB STATUS if the event wait semaphore of each I/O thread is set

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

  Fixed typo