into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.1-build

into  siva.hindu.god:/home/tsmith/m/bk/mysql-5.1-build

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

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

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

into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0

  Corrected default for --disable-grant-options

into  mysql.com:/d2/hf/mr10/my50-mr10

  Removed line accidently inserted when correcting bug#18526

into  mysql.com:/d2/hf/mr10/my51-mr10

into  mysql.com:/d2/hf/mr10/my50-mr10

- configure --disable-grant-options defines DISABLE_GRANT_OPTIONS
- configure.js/cmake also updated
- if DISABLE_GRANT_OPTIONS is defined, mysqld no longer recognizes:
  --bootstrap
  --init-file
  --skip-grant-tables

Scripts which rely on those three options are modified to check the environment for MYSQLD_BOOTSTRAP; it should be set to the full path of a mysqld which does handle those options.

For example:

$ export MYSQLD_BOOTSTRAP
$ MYSQLD_BOOTSTRAP=/path/to/full/MySQL/bin/mysqld
$ mysql_install_db
$ make test

support-files/MySQL-shared-compat.spec.sh  :    Dummy, irrelevant change - just trigger a new build.

no future build of it will include Berkeley DB:
Remove it from the Windows VC++ project files.

into  kpdesk.mysql.com:/home/thek/dev/mysql-5.0-build

into  kpdesk.mysql.com:/home/thek/dev/mysql-5.1-build

into  kpdesk.mysql.com:/home/thek/dev/bug23010/my51-bug23010

into  kpdesk.mysql.com:/home/thek/dev/bug23010/my50-bug23010

into  kpdesk.mysql.com:/home/thek/dev/bug23010/my41-fix23010

- "make_binary_distribution" accepts a dummy "--platform=" argument.

- "MySQL-shared-compat.spec" uses a "version40" define symbol internally.

into  thorsen-consulting.dk:/Users/mmj/bktrees/mysql-5.1-build

Cleaning up warning for windows. Innodb is compiled but disable on Windows, so it should be fine. NDB wasn't compiled in, which is what caused the issue. 

into  siva.hindu.god:/home/tsmith/m/bk/51-build

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

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

  Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
  correct "libgcc.a" path is returned for the 32/64 bit architecture

Fixes:
- Bug #24712: SHOW TABLE STATUS for file-per-table showing incorrect time fields
- Bug #24386: Performance degradation caused by instrumentation in mutex_struct
- Bug #24190: many exportable definitions of field_in_record_is_null
- Bug #21468: InnoDB crash during recovery with corrupted data pages: XA bug?

into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.1-build

into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0-build

  Patch from Alfredo for TARGET_FAT_BINARY

into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.0-build

into  tiger.mmj.dk:/Users/mmj/bktrees/mysql-5.1-build

  Add patch from Alfredo for TARGET_FAT_BINARY

into  zim.(none):/home/brian/mysql/merge-5.1

The CSV format has always relied on numbers being quoted, which doesn't always happen. This fixes that so that numbers can now be unquoted (and the output does this as well so that the log takes up less space). 

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

Split out the hidden class from the ha_tina file (probably should have just deleted it...) but this is a bit better.