summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge siva.hindu.god:/usr/home/tim/m/bk/50-buildtsmith/tim@siva.hindu.god2006-12-2019-31/+211
|\
| * Fix silly typos in the disabling of "im_daemon_life_cycle" (bug#24415).joerg@trift2.2006-12-201-1/+1
| * Merge trift2.:/MySQL/M50/clone-5.0joerg@trift2.2006-12-201-0/+1
| |\
| | * Disable test "im_deamon_life_cycle", Bug#24425, see note: [19 Dec 23:17] Trud...joerg@trift2.2006-12-201-0/+1
| * | Merge siva.hindu.god:/usr/home/tim/m/bk/50-releasetsmith/tim@siva.hindu.god2006-12-193-3/+4
| |\ \ | | |/
| | * Remove warnings by castingtsmith/tim@siva.hindu.god2006-12-193-3/+4
| * | Merge siva.hindu.god:/usr/home/tim/m/bk/50-releasetsmith/tim@siva.hindu.god2006-12-190-0/+0
| |\ \ | | |/ | |/|
| | * Merge siva.hindu.god:/usr/home/tim/m/bk/50-releasetsmith/tim@siva.hindu.god2006-12-1811-81/+151
| | |\
| * | \ Merge siva.hindu.god:/usr/home/tim/m/bk/50-24200tsmith/tim@siva.hindu.god2006-12-1913-2/+144
| |\ \ \
| | * | | Added innodb_rollback_on_timeout option to restore the 4.1 tsmith/tim@siva.hindu.god2006-12-1913-2/+144
| * | | | Alternative decimal2double implementation using an algorithmtsmith/tim@siva.hindu.god2006-12-191-8/+26
| * | | | Bug #24947: REPEAT function returns NULL when passed a field as the count par...tsmith/tim@siva.hindu.god2006-12-193-20/+39
| |/ / /
| * | | Merge mysql.com:/data0/mysqldev/my/mysql-5.0-releasedfischer/mysqldev@mysql.com/production.mysql.com2006-12-1911-81/+151
| |\ \ \ | | | |/ | | |/|
* | | | Merge siva.hindu.god:/usr/home/tim/m/bk/50-buildtsmith/tim@siva.hindu.god2006-12-200-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | This ChangeSet must be null-merged to 5.1.tsmith/tim@siva.hindu.god2006-12-1811-81/+151
* | | | Merge trift2.:/MySQL/M50/upward-5.0joerg@trift2.2006-12-202-0/+7
|\ \ \ \ | | |/ / | |/| |
| * | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-workdf@kahlann.erinye.com2006-12-182-0/+10
| |\ \ \
| | * \ \ Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-workdf@kahlann.erinye.com2006-12-181-0/+6
| | |\ \ \
| | | * | | Use a temporary directory for sockets if the socket path becomes too long.df@kahlann.erinye.com2006-12-181-0/+6
| | | * | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-builddf@kahlann.erinye.com2006-12-151-0/+7
| | | |\ \ \
| | | * \ \ \ Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-builddf@kahlann.erinye.com2006-12-144-9/+16
| | | |\ \ \ \
| | * | \ \ \ \ Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-builddf@kahlann.erinye.com2006-12-181-1/+5
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-builddf@kahlann.erinye.com2006-12-150-0/+0
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-builddf@kahlann.erinye.com2006-12-151-1/+9
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-builddf@kahlann.erinye.com2006-12-144-9/+16
| | | |\ \ \ \ \ \ \
| * | | | | | | | | | also include data files for varbinary test in binary distributiondf@kahlann.erinye.com2006-12-151-0/+1
| * | | | | | | | | | minor fixupdf@kahlann.erinye.com2006-12-151-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge trift2.:/MySQL/M50/push-5.0joerg@trift2.2006-12-181-1/+5
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | support-files/mysql.spec.shjoerg@trift2.2006-12-181-1/+5
| |/ / / / / / / /
| * | | | | | | | Merge trift2.:/MySQL/M50/spec-5.0joerg@trift2.2006-12-141-1/+9
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0df@kahlann.erinye.com2006-12-146-73/+113
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | BUG#24902 in 5.0df@kahlann.erinye.com2006-12-121-1/+1
| * | | | | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0df@kahlann.erinye.com2006-12-114-9/+16
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
* | | | | | | | | Merge trift2.:/MySQL/M50/spec-5.0joerg@trift2.2006-12-141-1/+9
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | support-files/mysql.spec.shjoerg@trift2.2006-12-141-1/+2
| * | | | | | | | Merge trift2.:/MySQL/M41/spec-4.1joerg@trift2.2006-12-141-0/+7
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | / / | | | |_|_|_|/ / | | |/| | | | |
| | * | | | | | support-files/mysql.spec.shjoerg@trift2.2006-12-141-0/+7
| | | |_|/ / / | | |/| | | |
* | | | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.1df@kahlann.erinye.com2006-12-1410-76/+135
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge mysql.com:/home/gluh/MySQL/Merge/5.0-optgluh@gluh.(none)2006-12-120-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge mysql.com:/home/gluh/MySQL/Merge/4.1-optgluh@mysql.com/gluh.(none)2006-12-120-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge mysql.com:/home/gluh/MySQL/Merge/4.1gluh@mysql.com/gluh.(none)2006-12-116-55/+93
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge bk-internal:/home/bk/mysql-4.1-maintmsvensson@neptunus.(none)2006-12-050-0/+0
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836iggy@rolltop.ignatz42.dyndns.org2006-12-051-8/+0
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836iggy@rolltop.ignatz42.dyndns.org2006-12-044-28/+147
| | | |\ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ Merge mysql.com:/home/gluh/MySQL/Merge/5.0gluh@mysql.com/gluh.(none)2006-12-126-73/+113
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Merge mysql.com:/home/gluh/MySQL/Merge/5.1gluh@gluh.(none)2006-12-1210-76/+135
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/hf/work/pfix/my50-pfixholyfoot/hf@deer.(none)2006-12-072-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | merging fixholyfoot/hf@mysql.com/deer.(none)2006-12-072-2/+2
| | * | | | | | | | | | | mergingholyfoot/hf@mysql.com/deer.(none)2006-12-071-2/+2
| | * | | | | | | | | | | Merge mysql.com:/home/hf/work/22372/my50-22372holyfoot/hf@deer.(none)2006-12-076-72/+112
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /