into  trift2.:/MySQL/M51/push-5.1

into  mysql.com:/home/kent/bk/config_h/mysql-5.1-build

into  mysql.com:/home/kent/bk/config_h/mysql-5.0-build

to "my_config.h". Not to pollute the top directory, and to get more control
over what is included. Made the include path for "libedit" pick up its own
"config.h" first.

into  mysql.com:/home/kent/bk/config_h/mysql-5.0-build

  Backport of correction for Mac OS X build problem, global variable not
  initiated is "common" and can't be used in shared libraries, unless
  special flags are used (bug#26218)

into  linux.site:/home/omer/source/jrg51

into  linux.site:/home/omer/source/jrg51

into  mysql.com:/home/kent/bk/tmp3/mysql-5.0-build

into  trift2.:/MySQL/M50/push-5.0

into  trift2.:/MySQL/M51/push-5.1

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch

into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0

into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.0

into  production.mysql.com:/usersnfs/jperkin/bk/mysql-5.1

into  production.mysql.com:/usersnfs/jperkin/bk/bug-28585-5.1

  Moved CERT files to where they are used, avoids conflict
  between two make files trying to install the same CERTs
SSL/*.pem, 
  Move: SSL/*.pem -> mysql-test/std_data/

into  debian.(none):/M51/omer-5.1

into  mysql.com:/data0/mysqldev/my/mysql-5.1-funcs1-dep

into  mysql.com:/data0/mysqldev/my/mysql-5.1-funcs1-dep

Step 2:
Restore the 5.1 contents in the 5.0-dependent files.

  - make the 'dist-hook' from top-level Makefile work again.
  - we can find my_print_defaults from --basedir by parsing command
    line arguments prior to running my_print_defaults.
  - take advantage of additional command line parsing and allow the
    --no-defaults etc arguments to work anywhere rather than having
    to be the first argument.
  - find SQL files either from binary archive or source install.
  - consolidate and tidy code and error messages.

The files below "mysql-test/suite/funcs_1" in version 5.1
did not depend on the equivalent ones in 5.0,
probably because they had been checked in independent of each other
in both versions.

Step 1:
Foreach file F in the suite that has a "deleted" counterpart D, use
    bk rm $F
    bk mv $D $F
to get those files into the 5.1 suite that (for BK) depend on 5.0.

into  mysql.com:/home/svoj/devel/mysql/BUG29957/mysql-5.1-engines

into  mysql.com:/home/svoj/devel/mysql/BUG29957/mysql-5.0-engines

INSERT/DELETE/UPDATE followed by ALTER TABLE within LOCK TABLES
may cause table corruption on Windows.

That happens because ALTER TABLE writes outdated shared state
info into index file.

Fixed by removing obsolete workaround.

Affects MyISAM tables on Windows only.

into  debian.(none):/M51/push-5.1

into  bk-internal.mysql.com:/data0/bk/mysql-5.1-arch

into  debian.(none):/M51/rowlock-5.1

into  debian.(none):/M50/push-5.0

For more information, see WL#3866 and the bugs numbered 28685 and 20390.

into  xiphis.org:/anubis/antony/work/mysql-5.1-engines.merge

into  xiphis.org:/anubis/antony/work/mysql-5.1-engines.merge

into  xiphis.org:/anubis/antony/work/mysql-5.0-engines.merge

into  debian.(none):/M51/push-5.1

into  debian.(none):/M51/push-5.1

into  debian.(none):/M51/bug16635-5.1

into  debian.(none):/M50/push-5.0

into  debian.(none):/M50/push-5.0