summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Second set of fixes for bug#35988.hhunger@hh-nb.hungers2008-04-1438-10/+66
* Fixes of system variable test programs for bug#35988.hhunger@hh-nb.hungers2008-04-1125-11/+45
* System variable tests delivered by Folio3 (see WL4288).hhunger@hh-nb.hungers2008-04-10517-0/+71653
* Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my51-bug15776cmiller@zippy.cornsilk.net2008-04-096-42/+410
|\
| * Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776cmiller@zippy.cornsilk.net2008-04-094-10/+27
| |\
| | * Follow-up to B-g#15776, test failures on 64-bit linux.cmiller@zippy.cornsilk.net2008-04-094-10/+26
| | * Test updated.cmiller@zippy.cornsilk.net2008-04-011-0/+1
| * | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776cmiller@zippy.cornsilk.net2008-03-318-32/+458
| |\ \ | | |/
| | * Fix minor complaints of Marc Alff, for patch against B-g#15776.cmiller@zippy.cornsilk.net2008-03-262-2/+5
| | * Bug#15776: 32-bit signed int used for length of blobcmiller@zippy.cornsilk.net2007-08-317-63/+434
* | | Merge five.local.lan:/work/merge/mysql-5.0-funcs_1mleich@five.local.lan2008-04-040-0/+0
|\ \ \
| * | | Backport of fix made in 5.1 to 5.0mleich@five.local.lan2008-04-041-1/+1
| * | | Merge five.local.lan:/work/trees/mysql-5.0-build-src-cleanmleich@five.local.lan2008-04-045-8/+8
| |\ \ \
* | \ \ \ Merge five.local.lan:/work/trees/mysql-5.1-build-src-cleanmleich@five.local.lan2008-04-045-8/+8
|\ \ \ \ \
| * \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294cmiller@zippy.cornsilk.net2008-04-035-8/+8
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Bug#26294: library name conflict between MySQL 4.x, 5.0 and Qt 3.3cmiller@zippy.cornsilk.net2008-04-035-8/+8
* | | | | | Merge five.local.lan:/work/merge/mysql-5.0-funcs_1mleich@five.local.lan2008-04-021-2/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Correct the location of the directory formleich@five.local.lan2008-04-021-2/+2
* | | | | | Post merge fix formleich@five.local.lan2008-04-0171-2964/+3120
* | | | | | Merge five.local.lan:/work/merge/mysql-5.0-Bugmleich@five.local.lan2008-03-3195-7016/+4699
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix for mleich@five.local.lan2008-03-31116-10700/+9096
* | | | | | apply snapshot innodb-5.1-ss2387df@pippilotta.erinye.com2008-03-2711-29/+108
* | | | | | Merge trift2.:/MySQL/M50/push-5.0joerg@trift2.2008-03-270-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-buildjoerg@trift2.2008-03-271-0/+2
| |\ \ \ \ \
* | \ \ \ \ \ Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-buildjoerg@trift2.2008-03-270-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-builddf@pippilotta.erinye.com2008-03-270-0/+0
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | BUG#25340df@pippilotta.erinye.com2008-03-271-0/+2
* | | | | | | | Merge trift2.:/MySQL/M51/ndb-decl-5.1joerg@trift2.2008-03-271-2/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | ndb_version.h.in : Fix a syntax error (variable declaration came too late).joerg@trift2.2008-02-051-2/+3
* | | | | | | | | Merge trift2.:/MySQL/M50/push-5.0joerg@trift2.2008-03-270-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge trift2.:/MySQL/M50/mysql-5.0joerg@trift2.2008-03-2744-102/+841
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2008-03-27357-75188/+25831
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge rhel5-ia64-a.mysql.com:/data0/tsmith/build/50tsmith@rhel5-ia64-a.mysql.com2008-03-270-0/+0
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0tsmith@rhel5-ia64-a.mysql.com2008-03-279-104/+98
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-buildcmiller@zippy.cornsilk.net2008-03-261-5/+28
| | |\ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ Merge rhel5-ia64-a.mysql.com:/data0/tsmith/51tsmith@rhel5-ia64-a.mysql.com2008-03-2710-30/+102
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Apply innodb-5.1-ss2360 snapshottsmith@rhel5-ia64-a.mysql.com2008-03-2710-30/+102
| * | | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1tsmith@rhel5-ia64-a.mysql.com2008-03-27347-75158/+25729
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1-buildcmiller@zippy.cornsilk.net2008-03-261-5/+28
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-buildcmiller@zippy.cornsilk.net2008-03-261-5/+28
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Suggestion of Tim. Avoid unnecessary sleep.cmiller@zippy.cornsilk.net2008-03-191-1/+1
| | | | * | | | | | | | | | Bug#30378: mysql.server needs to skip wait_for_pid() when mysqld \cmiller@zippy.cornsilk.net2008-03-191-4/+27
| | * | | | | | | | | | | | Merge trift2.:/MySQL/M50/push-5.0joerg@trift2.2008-03-250-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge trift2.:/MySQL/M50/mysql-5.0joerg@trift2.2008-03-2546-37/+534
| | | |\ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2008-03-25346-75153/+25701
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2008-03-25346-75153/+25701
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | |
| | | | * | | | | | | | | | | | Merge mysql.com:/home/kent/bk/build/mysql-5.0-buildkent@kent-amd64.(none)2008-03-220-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / /
| | | | | * | | | | | | | | | | Merge mysql.com:/home/kent/bk/build/mysql-4.1-buildkent@kent-amd64.(none)2008-03-220-0/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/kent/bk/mysql-4.1-releasekent@mysql.com/kent-amd64.(none)2008-03-221-32/+60
| | | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-4.1kent/mysqldev@mysql.com/production.mysql.com2008-03-177-46/+124
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \