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

- Added a stub scripts/fill_help_tables.sql file to satisfy the build dependencies
- Removed scripts/fill_help_tables.sh and updated scripts/Makefile.am accordingly

The fill_help_tables.sql stub will be replaced with the approriate content when building the
official source distribution via Bootstrap - it's now autogenerated on the documentation server
and will be copied into place before packing up the source distribution.

Manual merge of the ChangeSet to remove the dependency on manual.texi from the source tree (from 4.0)

  references to the .texi file and the build targets that depend on manual.texi as the input file.
- added COPYING as a regular file instead of creating it during the build. This ensures that it's part
  of the sources when pulling from BK (it used to be extracted from the manual)
- Removed a lot of cruft and unused/obsolete stuff from the Docs directory (e.g. Flags, Images)
- added a dummy mysql.info placeholder file (the info file is still used as the source to extract
  various text files during the build). It will be replaced with a "real" file during the Bootstrap
  process to create the official source distribution - the placeholder just satisfies build dependencies.

because config.status may later need this file (if it does not find it
it won't incorporate dependencies of errmsg.sys in sql/share/Makefile) (thx Serg).
In sql/share/Makefile.am using "all:" leads to double-"all:" in Makefile (thx Konstantin).

into quadita2.mysql.com:/nfstmp1/guilhem/mysql-4.1-4ita

if we fall back to mysql_alter_table() (for InnoDB), don't do binlogging in mysql_alter_table(), as mysql_admin_table()
is not supposed to do any binlogging (it is done by the caller).

into mdk10.(none):/home/reggie/bk/mysql-4.1

function" into 4.1 tree.

into mysql.com:/home/dlenev/src/mysql-4.1-merges

function".

We should not cache queries using CURRENT_USER() function as we do it
for some other functions, e.g. USER() function.

  fixing tests accordingly
item.cc:
  Allow mixing non-binary collation and binary collation
  even if coercibility is the same. 
  For easier 4.0 -> 4.1 migrating.

into xiphis.org:/.amd_mnt/bk.anubis/host/work-acurtis/bug6776.1

into xiphis.org:/var/db/bk/work-acurtis/bug6776.1

into mdk10.(none):/home/reggie/bk/mysql-4.1

into hundin.mysql.fi:/home/marko/mysql-4.1

Removed the extra set of the shared memory connect event from kill_mysql since it is also being set in kill_server

into mdk10.(none):/home/reggie/bk/mysql-4.1

into mysql.com:/M41/mysql-4.1

into mysql.com:/home/jonas/src/mysql-4.1

  test case for case 9749, ndb lock upgrade via NDBAPI

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

The shared memory connect event was not being set in kill_server.
This caused the thread that is handling shared memory connections to never
exit.

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

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

into mysql.com:/home/psergey/mysql-4.1-bug8877

if there are foreign key constraints on the table. (Bug #5574)

into mysql.com:/home/jimw/my/mysql-4.1-clean

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

between two server instances at server shutdown/startup.
This conflict on advisory locks appears to be the result of a bug
in the operating system; these locks should be released when the
files are closed, but somehow that does not always happen
immediately in Linux.  (Bug #9381)