summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1unknown2008-01-312-0/+21
|\
| * Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rplunknown2008-01-301-0/+5
| |\
| | * Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rplunknown2008-01-301-0/+5
| | |\
| | | * BUG#30435 loading large LOAD DATA INFILE breaks slave with unknown2007-12-211-0/+6
| * | | Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.1-rplunknown2007-12-191-0/+16
| |\ \ \ | | |/ /
| | * | Merge elkin@aelkin2.mysql.internal:MySQL/TEAM/FIXES/5.1/bug31609-conflict_det...unknown2007-12-121-0/+16
| | |\ \
| | | * | Bug#31552 Replication breaks when deleting rows from out-of-sync tableunknown2007-12-121-0/+16
* | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/51unknown2008-01-253-3/+38
|\ \ \ \ \
| * | | | | Post merge fix for BUG 33728unknown2008-01-111-1/+1
| * | | | | Bug#33728 Atomic builtinsunknown2008-01-112-2/+37
| |/ / / /
* | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2007-12-208-56/+56
|\ \ \ \ \ | |/ / / /
| * | | | Merge station.:/mnt/raid/alik/MySQL/devel/5.1unknown2007-12-145-11/+16
| |\ \ \ \
| | * \ \ \ Merge mysql.com:/home/gluh/MySQL/Merge/5.1unknown2007-12-135-11/+16
| | |\ \ \ \
| | | * \ \ \ Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2007-12-022-1/+4
| | | |\ \ \ \
| | | | * | | | Bug#31177: Server variables can't be set to their current valuesunknown2007-12-011-1/+2
| | | | * | | | Merge mysql.com:/misc/mysql/31177/50-31177unknown2007-12-012-1/+3
| | | | |\ \ \ \
| | | | | * | | | Bug#31177: Server variables can't be set to their current valuesunknown2007-11-302-1/+3
| | | | | | |_|/ | | | | | |/| |
| | | * | | | | Merge mysql.com:/home/hf/work/mrg/my50-mrgunknown2007-12-011-6/+5
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge mysql.com:/home/hf/work/mrg/my41-mrgunknown2007-11-301-5/+5
| | | | |\ \ \ \ \
| | | | | * | | | | Bug #31900 Wrong confusing comment in mysql_com.h header file.unknown2007-11-261-5/+5
| | | * | | | | | | Merge mysql.com:/home/hf/work/31890/my51-31890unknown2007-11-301-3/+3
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Bug #31890 Partitions: ORDER BY DESC in InnoDB not working.unknown2007-11-141-3/+3
| | | * | | | | | | | Merge magare.gmz:/home/kgeorge/mysql/work/B30355-5.0-optunknown2007-11-271-0/+4
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | |
| | | | * | | | | | | Bug #30355: Incorrect ordering of UDF resultsunknown2007-11-271-0/+4
| | | * | | | | | | | Bug #32211 Test 'windows' and 'windows_shm' failed for embedded serverunknown2007-11-181-1/+0
| * | | | | | | | | | Merge station.:/mnt/raid/alik/MySQL/devel/5.1unknown2007-12-132-15/+14
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2007-12-122-15/+14
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Bug#12713 "Error in a stored function called from a SELECT doesn't unknown2007-12-122-15/+14
| * | | | | | | | | | | Merge stella.local:/home2/mydev/mysql-5.1-bug30273unknown2007-12-111-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Bug#30273 - merge tables: Can't lock file (errno: 155)unknown2007-12-111-0/+1
| * | | | | | | | | | | Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1unknown2007-12-102-3/+7
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge trift2.:/MySQL/M51/mysql-5.1unknown2007-12-072-106/+94
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Merge mysql.com:/home/kent/bk/mac-os-x-universal/mysql-5.0-buildunknown2007-11-301-47/+25
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/kent/bk/mac-os-x-universal/mysql-4.1-buildunknown2007-11-301-47/+25
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | my_global.h:unknown2007-11-301-30/+25
| | | * | | | | | | | | | | | Excluded verbose and bad change to Mac OS X universal binaries handlingunknown2007-11-301-18/+1
| * | | | | | | | | | | | | | Merge mysql.com:/home/kent/bk/mac-os-x-universal/mysql-5.0-buildunknown2007-11-291-1/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | | | | / / / / / / / / / | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge mysql.com:/home/kent/bk/mac-os-x-universal/mysql-4.1-buildunknown2007-11-291-1/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / /
| | | * | | | | | | | | | | my_global.h:unknown2007-11-291-1/+18
| | | * | | | | | | | | | | BUG#29083 - test suite times out on OS X 64bit - also in older releasesunknown2007-11-091-0/+5
| | | | |_|_|_|_|/ / / / / | | | |/| | | | | | | | |
* | | | | | | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-forcollapseandmergeunknown2007-12-146-113/+125
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-12-072-3/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/51unknown2007-12-052-3/+7
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Merge mysql.com:/home/ram/work/b31137/b31137.5.0unknown2007-10-291-0/+2
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Fix for bug #31137: Assertion failed: primary_key_no == -1 || primary_key_no ...unknown2007-10-261-1/+1
| | | | * | | | | | | | | | Merge ramayana.hindu.god:/home/tsmith/m/bk/50unknown2007-10-222-4/+8
| | | | |\ \ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ \ Merge ramayana.hindu.god:/home/tsmith/m/bk/51unknown2007-10-221-3/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | Post-merge changes for bug #31207: Test "join_nested" shows different strateg...unknown2007-10-181-1/+1
| | | | * | | | | | | | | | | Merge polly.(none):/home/kaa/src/maint/mysql-5.0-maintunknown2007-10-181-2/+4
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / /
| | | | | * | | | | | | | | | Merge polly.(none):/home/kaa/src/maint/bug31207/my50-bug31174unknown2007-10-181-2/+4
| | | | | |\ \ \ \ \ \ \ \ \ \