summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* BUG#25048 - ERROR 126 : Incorrect key file for table '.XXXX.MYI'; try tounknown2006-12-264-7/+44
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-12-2134-115/+377
|\
| * configure.in : Update of the NDB version number was missing, do it.unknown2006-12-211-1/+1
| * Merge bk-internal.mysql.com:/data0/bk/mysql-5.0unknown2006-12-2033-114/+376
| |\
| | * Fix silly typos in the disabling of "im_daemon_life_cycle" (bug#24415).unknown2006-12-201-1/+1
| | * Merge trift2.:/MySQL/M50/clone-5.0unknown2006-12-201-0/+1
| | |\
| | | * Disable test "im_deamon_life_cycle", Bug#24425, see note: [19 Dec 23:17] Trud...unknown2006-12-201-0/+1
| | * | Merge siva.hindu.god:/usr/home/tim/m/bk/50-releaseunknown2006-12-193-3/+4
| | |\ \ | | | |/
| | | * Remove warnings by castingunknown2006-12-193-3/+4
| | * | Merge siva.hindu.god:/usr/home/tim/m/bk/50-releaseunknown2006-12-190-0/+0
| | |\ \ | | | |/ | | |/|
| | | * Merge siva.hindu.god:/usr/home/tim/m/bk/50-releaseunknown2006-12-1811-81/+151
| | | |\
| | * | \ Merge siva.hindu.god:/usr/home/tim/m/bk/50-24200unknown2006-12-1913-2/+144
| | |\ \ \
| | | * | | Added innodb_rollback_on_timeout option to restore the 4.1 unknown2006-12-1913-2/+144
| | * | | | Alternative decimal2double implementation using an algorithmunknown2006-12-191-8/+26
| | * | | | Bug #24947: REPEAT function returns NULL when passed a field as the count par...unknown2006-12-193-20/+39
| | |/ / /
| | * | | Merge mysql.com:/data0/mysqldev/my/mysql-5.0-releaseunknown2006-12-1911-81/+151
| | |\ \ \ | | | | |/ | | | |/|
| | | * | This ChangeSet must be null-merged to 5.1.unknown2006-12-1811-81/+151
| | * | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-workunknown2006-12-182-0/+10
| | |\ \ \
| | | * \ \ Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-workunknown2006-12-181-0/+6
| | | |\ \ \
| | | | * | | Use a temporary directory for sockets if the socket path becomes too long.unknown2006-12-181-0/+6
| | | | * | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-buildunknown2006-12-151-0/+7
| | | | |\ \ \
| | | | * \ \ \ Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-buildunknown2006-12-144-9/+16
| | | | |\ \ \ \
| | | * | \ \ \ \ Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-buildunknown2006-12-181-1/+5
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | |
| | | | * | | | | support-files/mysql.spec.shunknown2006-12-181-1/+5
| | | * | | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-buildunknown2006-12-150-0/+0
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-buildunknown2006-12-151-1/+9
| | | | |\ \ \ \ \
| | | | * \ \ \ \ \ Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-buildunknown2006-12-144-9/+16
| | | | |\ \ \ \ \ \
| | * | | | | | | | | also include data files for varbinary test in binary distributionunknown2006-12-151-0/+1
| | * | | | | | | | | minor fixupunknown2006-12-151-1/+1
| | |/ / / / / / / /
* | | | | | | | | | Merge chilla.local:/home/mydev/mysql-4.1-axmrgunknown2006-12-205-7/+14
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Bug#25213 - Compiler warnings in MyISAM codeunknown2006-12-204-8/+17
| * | | | | | | | | | Bug#25208 - Warnings in mi_packrec.cunknown2006-12-201-6/+7
* | | | | | | | | | | Merge chilla.local:/home/mydev/mysql-4.1-axmrgunknown2006-12-190-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2006-12-1911-64/+116
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge trift2.:/MySQL/M41/spec-4.1unknown2006-12-141-0/+7
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
| | * | | | | | | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1unknown2006-12-146-55/+93
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | |
| | * | | | | | | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1unknown2006-12-114-9/+16
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
* | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-12-1913-85/+140
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Raise version number after cloning 5.0.32unknown2006-12-151-1/+1
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge trift2.:/MySQL/M50/spec-5.0unknown2006-12-141-1/+9
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| | * | | | | | | | | support-files/mysql.spec.shunknown2006-12-141-1/+2
| | * | | | | | | | | Merge trift2.:/MySQL/M41/spec-4.1unknown2006-12-141-0/+7
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / | | | |/| | | | / / / | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | | * | | | | | | support-files/mysql.spec.shunknown2006-12-141-0/+7
| | | | |_|_|/ / / | | | |/| | | | |
| * | | | | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0unknown2006-12-146-73/+113
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge mysql.com:/home/gluh/MySQL/Merge/4.1-optunknown2006-12-120-0/+0
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge mysql.com:/home/gluh/MySQL/Merge/4.1unknown2006-12-116-55/+93
| | | |\ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.0unknown2006-12-126-73/+113
| | |\ \ \ \ \ \ \
| | | * | | | | | | merging fixunknown2006-12-072-2/+2
| | | * | | | | | | mergingunknown2006-12-073-18/+19
| | | * | | | | | | Merge mysql.com:/home/hf/work/22372/my41-22372unknown2006-12-066-62/+101
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |