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

  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

into mysql.com:/M40/mysql-4.0

(backport from 4.1).

into krsna.patg.net:/home/patg/mysql-4.0

  bug #5001, added conditional if to test if port set, then only kill the processes
  for this port, not all processes (in the case of this bug where multiple servers 
  are killed.)
  The change to the 'grep' to make sure mysqld_safe isn't killed was per Serg's
  discovery that mysqld_safe would get killed. 
  In my testing, in killing one of the pids for a running server, the "if test ! -f $pid_file"
  was the case that evaluated as true, so in order to test, I had to comment that block
  out.

  Remove --warnings for mysql-test-run. Devs don't use it, and Serg says it's not needed anymore.

used in the handle_options() function (instead of using additional 
handle_option() parameter). The default value of the 
my_getopt_error_reporter is default_reporter(). One can set it to
other functions if case of need.

functionality. The existing code takes advantage of this when
"typedef"ing 'longlong' in 'my_global.h'. This holds for Alpha CPUs.
If the compiler then has prototypes for C99 functions 'strtoll()' and
'strtoull()' but no implementation, the existing code in 'strtoull.c'
collides with that prototype. These collisions are avoided now.
(backport from 4.1)

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

   with the sleep value we use for the test suite run during the
   release builds

  Fixed missing * in comment in setup_windows_event_source

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

We must not reset the charset in slave after each statement, otherwise the SET CHARACTER SET is cancelled immediately.
Instead, we write a SET CHARACTER SET DEFAULT to the master's binlog when needed (like we already do for SET FOREIGN_KEY_CHECKS);
such writing is not necessary in 4.1 (in 4.1 the bug does not exist, as the SET ONE_SHOT syntax is used).
I have written a test and it works, but I'm not pushing the test as it requires building with all charsets.
I have noticed differences between what is inserted in the master's table in 4.0 and 4.1, and alerted Bar.

Initialize LOG_error_log before get_options to not use an uninitalized mutex in case of an error from handle_options()

or --with-extra-charsets=complex is given.

  Bug #4558 Escape handling error for ENUM values in SJIS encoding

  Wrong UPPER/LOWER translation for Cyrillic letter tse was fixed.
  bug#5110

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

This file was part of the patch for 
Bug #4466  	Nothing in .err when mysql service ends because of malformed my.ini options 

message.mc:
  new file

   when pulling BK trees before.

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

into hegel.txg.br:/home/miguel/bk/mysql-4.0

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

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

   of MySQL (BUG#3860)

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

into mysql.com:/M40/mysql-4.0