into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge

into  mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge

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

The test uses show binlog event which is not deterministic due to the single insert delayed
query can generate up to number of inserted rows row-events pair (table_map + Write_row)

The solution is to leave the current binlogging behaviour as it is and change 
the test as spliting arguments of insert delayed query. Note, that such fix was applied
earlier for  binlog_insert_delayed.test :
https://intranet.mysql.com/secure/apps/irclog.php?channel=22&start_time=2006-09-27 

There are no tests with insert delayed and show binlog events combination requiring
this fix.

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  suse.vabb.com:/home/Chuck/development/mysql-5.1-new-rpl

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

This patch is an additional code change to the get_str_len_and_pointer 
method in log_events.cc. This change is necessary to correct a problem
encountered on 64-bit SUSE where the auto_increment_* variables were
being overwritten. The change corrects a cast mismatch which caused
the problem.

  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

correctly in some cases", from 5.0.
In short, calls to a stored function located in another database
than the default database, may fail to replicate if the call was made
by SET, SELECT, or DO.
sp_head.cc automerged, only the test and test's result had to be hand-merged.

into  gbichot3.local:/home/mysql_src/mysql-5.1-rpl-19725

correctly in some cases".
In short, calls to a stored function located in another database
than the default database, may fail to replicate if the call was made
by SET, SELECT, or DO.
Longer: when a stored function is called from a statement which does not go
to binlog ("SET @A=somedb.myfunc()", "SELECT somedb.myfunc()",
"DO somedb.myfunc()"), this crafted statement is binlogged:
"SELECT myfunc();" (accompanied with a mention of the default database
if there is one). So, if "somedb" is not the default database,
the slave would fail to find myfunc(). The fix is to specify the
function's database name in the crafted binlogged statement, like this:
"SELECT somedb.myfunc();". Test added in rpl_sp.test.

- "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