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

into  mysql.com:/home/svoj/devel/mysql/BUG23196/mysql-4.1-engines

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

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

into  mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-4.1-engines

into  chilla.local:/home/mydev/mysql-5.0-axmrg

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

into  mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-4.1-engines

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

into  mysql.com:/home/svoj/devel/mysql/BUG24358/mysql-4.1-engines

into  xiphis.org:/home/antony/work2/mysql-5.0-engines-merge

            repair it

Multi-table delete that is optimized with QUICK_RANGE reports table
corruption.

DELETE statement must not use KEYREAD optimization, and sets
table->no_keyread to 1. This was ignored in QUICK_RANGE optimization.

With this fix QUICK_RANGE optimization honors table->no_keyread
value and does not enable KEYREAD when it is requested.

  Changed header to GPL version 2 only

into  chilla.local:/home/mydev/mysql-5.0-axmrg

into  bk-internal.mysql.com:/data0/bk/mysql-5.0-build

into  chilla.local:/home/mydev/mysql-5.0-axmrg

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

into  mysql.com:/home/svoj/devel/mysql/BUG21310/mysql-4.1-engines

An update that used a join of a table to itself and modified the
table on one side of the join reported the table as crashed or
updated wrong rows.

Fixed by creating temporary table for self-joined multi update statement.

Compiler warnings due to non-matching conversion
specifications in format strings in DBUG_PRINT calls,
due to non-used parameters (in non-debug mode), and
due to seemingly uninitialized variables.

Initialized variables, declared parameters unused, and
casted DBUG_PRINT arguments to get rid of warnings.

Compiler warnings due to non-matching conversion
specifications in format strings in DBUG_PRINT calls.

Fixed DBUG_PRINT format specifiactions.

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

into  siva.hindu.god:/usr/home/tim/m/bk/50-build

into  siva.hindu.god:/usr/home/tim/m/bk/50-build

into  siva.hindu.god:/usr/home/tim/m/bk/50-release

more similar to my_strtod() (and maybe even a bit faster due
to less floating point divisions).

This should at least partially fix Bug #23260 for DECIMALs
with a moderate number of total digits.

InnoDB timeout behavior (Bug #24200)

Handling of large signed/unsigned values was not consistent, so some string functions could return bogus results.
The current fix is to simply patch up the val_str() methods for those string items.
It would be good clean this code up in general, to make similar problems much harder to make.  This is left as an exercise for the reader.

into  chilla.local:/home/mydev/mysql-5.0-axmrg

into  chilla.local:/home/mydev/mysql-5.0-axmrg

into  mysql.com:/data0/mysqldev/my/build-200612151202-5.0.32/mysql-5.0-release

into  chilla.local:/home/mydev/mysql-4.1-axmrg

into  siva.hindu.god:/usr/home/tim/m/bk/50-build

Applied innodb-5.0-ss1040 and innodb-5.0-ss1099 snapshots.

Bugs fixed:
- Bug #21468: InnoDB crash during recovery with corrupted data pages: XA bug?
- Bug #24299: Identifiers in foreign keys cannot contain U+0160, U+0360, ..., U+FF60
- Bug #24386: Performance degradation caused by instrumentation in mutex_struct
- Bug #24712: SHOW TABLE STATUS for file-per-table showing incorrect time fields

into  kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-release