summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Bug #29245: Bad Merge Caused Error Codes Conflict between 5.0/5.1mysql-5.1.20-betamysql-5.1.20unknown2007-06-2626-138/+146
* Merge trift2.:/MySQL/M50/clone-5.0unknown2007-06-254-5/+29
|\
| * Steal part of fix for bug#25621 from monty for 5.0.44.mysql-5.0.44clone-5.0.44-buildunknown2007-06-211-0/+15
| * configure.in:unknown2007-06-204-6/+17
* | Merge trift2.:/MySQL/M50/push-5.0clone-5.1.20-buildunknown2007-06-220-0/+0
|\ \
| * \ Merge trift2.:/MySQL/M50/mysql-5.0unknown2007-06-223-4/+12
| |\ \
* | \ \ Merge trift2.:/MySQL/M51/mysql-5.1unknown2007-06-223-4/+12
|\ \ \ \
| * \ \ \ Merge trift2.:/MySQL/M50/push-5.0unknown2007-06-221-0/+8
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Add the "nist" suite to the "test-bt" target,unknown2007-06-221-0/+8
| * | | | Merge trift2.:/MySQL/M50/push-5.0unknown2007-06-220-0/+0
| |\ \ \ \ | | |/ / /
| | * | | Merge trift2.:/MySQL/M50/mysql-5.0unknown2007-06-222-4/+4
| | |\ \ \
| * | \ \ \ Merge trift2.:/MySQL/M51/mysql-5.1unknown2007-06-222-4/+4
| |\ \ \ \ \
| | * \ \ \ \ Merge trift2.:/MySQL/M50/push-5.0unknown2007-06-210-0/+0
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge trift2.:/MySQL/M50/mysql-5.0unknown2007-06-218-28/+99
| | | |\ \ \ \
| | * | \ \ \ \ Merge trift2.:/MySQL/M51/mysql-5.1unknown2007-06-2155-951/+2176
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge trift2.:/MySQL/M50/push-5.0unknown2007-06-180-0/+0
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Merge trift2.:/MySQL/M41/push-4.1unknown2007-06-180-0/+0
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1-buildunknown2007-06-181-2/+2
| | | | |\ \ \ \ \ \
| | | * | \ \ \ \ \ \ Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0-buildunknown2007-06-181-2/+2
| | | |\ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2007-06-181-2/+2
| | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-buildunknown2007-06-180-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-buildunknown2007-06-180-0/+0
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / | | | | | |/| | | | | | |
| | | | | * | | | | | | | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1-buildunknown2007-06-181-2/+2
| | | | | |\ \ \ \ \ \ \ \
| | | | * | \ \ \ \ \ \ \ \ Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-buildunknown2007-06-181-2/+2
| | | | |\ \ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ \ Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2007-06-181-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-buildunknown2007-06-181-2/+2
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / | | | | | |/| | | | | | | | | |
| | | | | * | | | | | | | | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-4.1-buildunknown2007-06-181-2/+2
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|/ / / / / / / / | | | | | | |/| | | | | | | | |
| | | | | | * | | | | | | | | | don't use bk cset in commit e-mailsunknown2007-06-181-2/+2
| | * | | | | | | | | | | | | | Merge trift2.:/MySQL/M50/push-5.0unknown2007-06-181-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | / / / / / / / | | | | |_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | | Merge trift2.:/MySQL/M41/push-4.1unknown2007-06-181-2/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / | | | |/| | | | | / / / / / / | | | | | |_|_|_|/ / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Merge trift2.:/MySQL/M41/clone-4.1unknown2007-06-185-9/+625
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | VC++Files/sql/mysqld.vcprojmysql-4.1.23unknown2007-06-121-5/+41
| | | | | * | | | | | | | | libmysqld.def:unknown2007-06-121-2/+2
| | | | | * | | | | | | | | mysqldemb.vcproj:unknown2007-06-102-1/+578
| | | | | * | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/41gcaunknown2007-06-081-1/+4
| | | | | |\ \ \ \ \ \ \ \ \
| | | | * | \ \ \ \ \ \ \ \ \ Merge trift2.:/MySQL/M41/mysql-4.1unknown2007-06-183-23/+39
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|/ / / / / / | | | | | |/| | | | | | | | |
* | | | | | | | | | | | | | | Merge maint1.mysql.com:/data/localhome/tsmith/bk/maint/50unknown2007-06-220-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-06-226-4/+104
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2007-06-22357-1999/+27745
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | binlog_innodb.result:unknown2007-06-221-12/+12
| * | | | | | | | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-06-221-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Disabled new test cases that are not 100% stable yetunknown2007-06-211-0/+3
| * | | | | | | | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-rplunknown2007-06-21298-1022/+24685
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rplunknown2007-06-210-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / | | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.1unknown2007-06-2155-951/+2176
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | merge rpl 5.0->5.1unknown2007-06-211-2/+7
| | * | | | | | | | | | | | | | | Merge mysql.com:/nfsdisk1/lars/bk/mysql-5.0-rplunknown2007-06-213-2/+125
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | Test case fix to replication team tree.unknown2007-06-212-19/+31
| | * | | | | | | | | | | | | | | | Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rplunknown2007-06-212-35/+23
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | Fixing result mismatch in rpl_deadlock_innodb result file.unknown2007-06-212-35/+23
View Lorry Controller Status