summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2008-03-27347-75158/+25729
|\
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2008-03-261-5/+28
| |\
| | * Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-buildunknown2008-03-261-5/+28
| | |\
| | | * Suggestion of Tim. Avoid unnecessary sleep.unknown2008-03-191-1/+1
| | | * Bug#30378: mysql.server needs to skip wait_for_pid() when mysqld \unknown2008-03-191-4/+27
| * | | Merge trift2.:/MySQL/M50/push-5.0unknown2008-03-250-0/+0
| |\ \ \
| | * \ \ Merge trift2.:/MySQL/M50/mysql-5.0unknown2008-03-2546-37/+534
| | |\ \ \
| * | \ \ \ Merge trift2.:/MySQL/M51/mysql-5.1unknown2008-03-25346-75153/+25701
| |\ \ \ \ \
| | * \ \ \ \ Merge trift2.:/MySQL/M51/mysql-5.1unknown2008-03-25346-75153/+25701
| | |\ \ \ \ \
| | | * \ \ \ \ Merge mysql.com:/home/kent/bk/build/mysql-5.0-buildunknown2008-03-220-0/+0
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge mysql.com:/home/kent/bk/build/mysql-4.1-buildunknown2008-03-220-0/+0
| | | | |\ \ \ \
| | | | | * \ \ \ Merge mysql.com:/home/kent/bk/mysql-4.1-releaseunknown2008-03-221-32/+60
| | | | | |\ \ \ \
| | | | | | * \ \ \ Merge bk-internal:/home/bk/mysql-4.1unknown2008-03-177-46/+124
| | | | | | |\ \ \ \
| | | | | | * | | | | mysql.spec.sh:unknown2008-03-011-32/+60
| | | * | | | | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50unknown2008-03-190-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-buildunknown2008-03-192-2/+6
| | | | |\ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2008-03-191-0/+4
| | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50unknown2008-03-191-0/+4
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / | | | | | |/| | | | | | |
| | | | | * | | | | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/b25486/50unknown2008-03-192-2/+6
| | | | | |\ \ \ \ \ \ \ \
| | | | | | * | | | | | | | Bug #25486: mysqld_multi.server.sh missing from buildsunknown2008-03-102-2/+6
| | | * | | | | | | | | | | Merge trift2.:/MySQL/M50/push-5.0unknown2008-03-190-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Merge trift2.:/MySQL/M41/push-4.1unknown2008-03-190-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / / / | | | | | |/| | | | | | | |
| | | | | * | | | | | | | | Merge trift2.:/MySQL/M41/man8-4.1unknown2008-03-191-0/+6
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ Merge trift2.:/MySQL/M41/mysql-4.1unknown2008-03-191-2/+2
| | | | | |\ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | Raise version number after cloning 4.1.24unknown2008-03-181-2/+2
| | | | | | | |_|_|_|_|/ / / / | | | | | | |/| | | | | | | |
| | | * | | | | | | | | | | | Merge trift2.:/MySQL/M50/man8-5.0unknown2008-03-191-0/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / | | | | | | | | / / / / / / / | | | | |_|_|_|/ / / / / / / | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | Merge trift2.:/MySQL/M41/man8-4.1unknown2008-03-191-0/+6
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / | | | | | |/| | / / / / / / | | | | | |_|_|/ / / / / / | | | | |/| | | | | | | |
| | | | | * | | | | | | | support-files/mysql.spec.sh : Add the man pages for "ndbd" and "ndb_mgmd".unknown2008-03-191-0/+6
| | | | | |/ / / / / / /
| | | * | | | | | | | | Merge trift2.:/MySQL/M50/push-5.0unknown2008-03-140-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | Merge trift2.:/MySQL/M41/push-4.1unknown2008-03-140-0/+0
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / /
| | | | | * | | | | | | Merge trift2.:/MySQL/M41/mysql-4.1unknown2008-03-147-46/+124
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / /
| | | | * | | | | | | | Merge trift2.:/MySQL/M50/clone-5.0unknown2008-03-142-0/+4
| | | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ Merge trift2.:/MySQL/M50/mysql-5.0unknown2008-03-1481-406/+1339
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ | | | | |/| | | | | | | |
| | | | * | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug34192/my50-bug34192unknown2008-03-131-3/+24
| | | | |\ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ Merge trift2.:/MySQL/M51/mysql-5.1unknown2008-03-14121-726/+2058
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug34192/my51-bug34192unknown2008-03-131-3/+24
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug34192/my50-bug34192unknown2008-03-131-3/+24
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / / | | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | | Bug#34192: mysqldump from mysql 5.0.51 silently fails on dumping \unknown2008-03-121-3/+24
| | | * | | | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26703/my51-bug26703unknown2008-03-123-2/+33
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Bug#26703: DROP DATABASE fails if database contains a #mysql50# \unknown2008-03-123-2/+33
| | | * | | | | | | | | | | | | Merge five.local.lan:/work/trees/mysql-5.0-build-src-cleanunknown2008-03-120-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / / / | | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | | Merge five.local.lan:/work/merge/mysql-5.0-funcs_1unknown2008-03-1236-8819/+38004
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ \ \ \ Merge five.local.lan:/work/merge/mysql-5.1-funcs_1unknown2008-03-1239-7345/+107
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | Post merge fix forunknown2008-03-1231-423/+64
| | | | * | | | | | | | | | | | | | Merge five.local.lan:/work/merge/mysql-5.0-funcs_1unknown2008-03-118-6922/+43
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / | | | | | |/| | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | Post fix forunknown2008-03-1136-8819/+38004
| | | * | | | | | | | | | | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2008-03-110-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge trift2.:/MySQL/M50/win-scripts-5.0unknown2008-03-110-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | Merge trift2.:/MySQL/M50/clone-5.0unknown2008-03-112-0/+4
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / | | | | | |/| | | | | | | / / / / / / | | | | | | | |_|_|_|_|_|/ / / / / / | | | | | | |/| | | | | | | | | | |
| | | | | | * | | | | | | | | | | | Include "mysql_upgrade_shell.pl" in a binary distribution on Windows.unknown2008-03-051-0/+1