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

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


VC++Files/libmysqld/libmysqld.dsp:
  Auto merged
VC++Files/mysql.dsw:
  Auto merged
VC++Files/mysqldemb/mysqldemb.dsp:
  Auto merged
VC++Files/sql/mysqld.dsp:
  Auto merged
VC++Files/sql/mysqldmax.dsp:
  Auto merged
mysys/my_read.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Auto merged
support-files/MySQL-shared-compat.spec.sh:
  Auto merged

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


configure.in:
  Auto merged
mysql-test/install_test_db.sh:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
scripts/mysql_install_db.sh:
  Auto merged
sql/CMakeLists.txt:
  Auto merged
sql/mysqld.cc:
  Auto merged
win/configure.js:
  Auto merged

into  trift2.:/MySQL/M41/push-4.1


VC++Files/mysql.dsw:
  Null-merge: Removal of BerkeleyDB is limited to 4.0
VC++Files/libmysqld/libmysqld.dsp:
  Null-merge: Removal of BerkeleyDB is limited to 4.0
VC++Files/mysqldemb/mysqldemb.dsp:
  Null-merge: Removal of BerkeleyDB is limited to 4.0
VC++Files/mysqlserver/mysqlserver.dsp:
  Null-merge: Removal of BerkeleyDB is limited to 4.0
VC++Files/sql/mysqld.dsp:
  Null-merge: Removal of BerkeleyDB is limited to 4.0
VC++Files/sql/mysqldmax.dsp:
  Null-merge: Removal of BerkeleyDB is limited to 4.0

into  trift2.:/MySQL/M41/push-4.1


mysys/my_read.c:
  Auto merged
scripts/make_binary_distribution.sh:
  Null merge, because "--platform" is already a real argument in 4.1
support-files/MySQL-shared-compat.spec.sh:
  Null merge, because the 4.1 version already uses two digits
  for "version40" and "version41".

  Corrected default for --disable-grant-options


configure.in:
  Corrected default for --disable-grant-options

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

  Removed line accidently inserted when correcting bug#18526


configure.in:
  Removed line accidently inserted when correcting bug#18526

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


configure.in:
  WL#3670
  
  Add --disable-grant-options
mysql-test/install_test_db.sh:
  Add MYSQLD_BOOTSTRAP env variable, to enable test suite to work even if mysqld does not accept --bootstrap or --skip-grant-tables.
mysql-test/mysql-test-run.pl:
  Add MYSQLD_BOOTSTRAP env variable, to enable test suite to work even if mysqld does not accept --bootstrap or --skip-grant-tables.
mysql-test/mysql_test_run_new.c:
  Mention need for MYSQLD_BOOTSTRAP in a comment, in case this needs to be used with a mysqld which does not accept the --bootstrap option.
scripts/mysql_install_db.sh:
  Add MYSQLD_BOOTSTRAP env variable, to enable mysqld_install_db to work even if mysqld does not accept --bootstrap or --skip-grant-tables.
sql/CMakeLists.txt:
  Add DISABLE_GRANT_OPTIONS define
sql/mysqld.cc:
  Add DISABLE_GRANT_OPTIONS define, which removes the --bootstrap, --init-file, and --skip-grant-tables options
win/README:
  Document the DISABLE_GRANT_OPTIONS define
win/configure.js:
  Handle DISABLE_GRANT_OPTIONS

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


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-4.1-build

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

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


mysys/mf_iocache.c:
  Auto merged
mysys/my_seek.c:
  Auto merged

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


mysys/mf_iocache.c:
  Auto merged
mysys/my_seek.c:
  Auto merged

mysys/mf_iocache.c:
  Exclude
mysys/my_seek.c:
  Exclude

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

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


scripts/make_binary_distribution.sh:
  Newer versions of the release build tools call this with a "--platform=" argument
  which we seem not to need in 4.0, but which makes the tool crash (happened on SCO).
  
  Rather than add another version check into the build tools, just accept a "--platform="
  argument and ignore it, just give a message.
support-files/MySQL-shared-compat.spec.sh:
  The current version of "Do-shared-compat" needs two digits to identify the release families
  (to differ between 4.0 and 4.1), so the variable "version4" must get renamed to "version40".

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


scripts/make_binary_distribution.sh:
  Auto merged

  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


scripts/make_binary_distribution.sh:
  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
support-files/mysql.spec.sh:
  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

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


include/my_global.h:
  Auto merged

  Patch from Alfredo for TARGET_FAT_BINARY


include/my_global.h:
  Patch from Alfredo for TARGET_FAT_BINARY

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

  Add patch from Alfredo for TARGET_FAT_BINARY


include/my_global.h:
  Add patch from Alfredo for TARGET_FAT_BINARY

mysql-test/r/flush_block_commit_notembedded.result:
  result fixed

mysql-test/t/mysql_upgrade.test:
  test disabled in embedded server

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


libmysqld/lib_sql.cc:
  merging

libmysqld/lib_sql.cc:
  reading warning count added

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

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


libmysqld/lib_sql.cc:
  merging

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


mysql-test/t/mysqladmin.test:
  Auto merged
sql/item_func.cc:
  Auto merged
libmysqld/lib_sql.cc:
  merging
mysql-test/t/distinct.test:
  merging
sql/sql_prepare.cc:
  SCCS merged

libmysqld/lib_sql.cc:
  error message moved to 'stmt'
mysql-test/t/distinct.test:
  temporary disabled in embedded server
mysql-test/t/mysqladmin.test:
  disabled in embedded server
sql/sql_prepare.cc:
  superfluous #ifndef removed

  Temporary work around for bug#25359


mysql-test/r/view.result:
  Temporary work around for bug#25359

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


innobase/buf/buf0buf.c:
  Auto merged
innobase/dict/dict0dict.c:
  Auto merged
innobase/fil/fil0fil.c:
  Auto merged
innobase/ha/ha0ha.c:
  Auto merged
innobase/include/hash0hash.h:
  Auto merged
innobase/lock/lock0lock.c:
  Auto merged
innobase/log/log0recv.c:
  Auto merged

  Renamed hash_create() not to clash with imap using embedded server (bug#13859)


innobase/buf/buf0buf.c:
  Renamed hash_create() not to clash with imap using embedded server (bug#13859)
innobase/dict/dict0dict.c:
  Renamed hash_create() not to clash with imap using embedded server (bug#13859)
innobase/fil/fil0fil.c:
  Renamed hash_create() not to clash with imap using embedded server (bug#13859)
innobase/ha/ha0ha.c:
  Renamed hash_create() not to clash with imap using embedded server (bug#13859)
innobase/ha/hash0hash.c:
  Renamed hash_create() not to clash with imap using embedded server (bug#13859)
innobase/include/hash0hash.h:
  Renamed hash_create() not to clash with imap using embedded server (bug#13859)
innobase/lock/lock0lock.c:
  Renamed hash_create() not to clash with imap using embedded server (bug#13859)
innobase/log/log0recv.c:
  Renamed hash_create() not to clash with imap using embedded server (bug#13859)
innobase/thr/thr0loc.c:
  Renamed hash_create() not to clash with imap using embedded server (bug#13859)

  Don't use thread priority by default on Mac OS X (bug#18526)


configure.in:
  Don't use thread priority by default on Mac OS X (bug#18526)
sql/mysqld.cc:
  Don't use thread priority by default on Mac OS X (bug#18526)

  Build "mysqld_error.h" even if configured --withouth-server (bug#21265)


configure.in:
  Build "mysqld_error.h" even if configured --withouth-server (bug#21265)

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


configure.in:
  Auto merged