summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Auto-merge from mysql-trunk-merge.Alexander Nozdrin2010-07-2968-564/+617
|\
| * Merge mysql-5.1-bugteam -> mysql-trunk-mergeVasil Dimov2010-07-290-0/+0
| |\
| | * Merge mysql-5.1-innodb -> mysql-5.1-bugteamVasil Dimov2010-07-2923-82/+556
| | |\
| | | * Merge mysql-5.1-bugteam -> mysql-5.1-innodbVasil Dimov2010-07-29205-2112/+2517
| | | |\ | | | |/ | | |/|
| | | * Fix bug #55581 by backporting fix of #52546 from mysql-trunk-innodbJimmy Yang2010-07-285-34/+43
| | | * Increment InnoDB Plugin version to 1.0.11.Vasil Dimov2010-07-231-1/+1
| | | * Merge mysql-5.1 -> mysql-5.1-innodbVasil Dimov2010-07-23180-1640/+4497
| | | |\
| | | * \ Merge mysql-5.1 -> mysql-5.1-innodbVasil Dimov2010-07-090-0/+0
| | | |\ \
| | | * | | Add the innodb_plugin tests to "make dist".Vasil Dimov2010-07-071-0/+2
| | | * | | Add innodb_bug53756-master.opt for innodb_bug53756 test.Jimmy Yang2010-07-053-2/+3
| | | * | | Port fix for bug #54311 from mysql-trunk-innodb to mysql-5.1-innodb codeline.Jimmy Yang2010-06-305-6/+35
| | | * | | Bug#54358 follow-up: Correct some error handling.Marko Mäkelä2010-06-301-6/+3
| | | * | | Correct some comments that were added in the fix of Bug #54358Marko Mäkelä2010-06-302-48/+19
| | | * | | ChangeLog entry for Bug #54408Marko Mäkelä2010-06-291-0/+5
| | | * | | Bug#54408: txn rollback after recovery: row0umod.c:673Marko Mäkelä2010-06-293-3/+40
| | | * | | ChangeLog entry for Bug #54358Marko Mäkelä2010-06-291-0/+7
| | | * | | Bug#54358: READ UNCOMMITTED access failure of off-page DYNAMIC or COMPRESSEDMarko Mäkelä2010-06-295-17/+133
| | | * | | Check in fix for bug #53756: "ALTER TABLE ADD PRIMARY KEY affectsJimmy Yang2010-06-283-14/+315
| * | | | | Merge mysql-5.1-bugteam -> mysql-trunk-mergeVasil Dimov2010-07-291-3/+3
| |\ \ \ \ \ | | |/ / / /
| | * | | | Postfix for BUG#45012.Alexander Barkov2010-07-291-3/+3
| * | | | | Manual mergeunknown2010-07-299-19/+185
| |\ \ \ \ \ | | |/ / / /
| | * | | | BUG#49124 Security issue with /*!-versioned */ SQL statements on Slaveunknown2010-07-299-17/+173
| * | | | | Null merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-280-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bug#55501: Disable innodb plugin usage in the embedded server on certain OSesDavi Arnaut2010-07-231-0/+1
| * | | | | merged BUG#55322 from 5.1-bugteam to trunk-mergeSven Sandberg2010-07-263-1/+51
| |\ \ \ \ \ | | |/ / / /
| | * | | | merged BUG#55322 to 5.1-bugteamSven Sandberg2010-07-263-1/+51
| | |\ \ \ \
| | | * | | | BUG#55322: SHOW BINLOG EVENTS increases @@SESSION.MAX_ALLOWED_PACKETSven Sandberg2010-07-203-1/+51
| | | | |/ / | | | |/| |
| * | | | | Merging from mysql-5.1-bugteamAlexander Barkov2010-07-2613-340/+181
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bug#45012 my_like_range_cp932 generates invalid stringAlexander Barkov2010-07-2613-338/+181
| * | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-234-9/+24
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge 5.1-bugteam -> 5.1-bug-42496Dmitry Shulga2010-07-23299-2454/+9857
| | |\ \ \ \
| | * | | | | Fixed bug #42496 - the server could crash on a debug assert after a failureDmitry Shulga2010-07-214-8/+24
| * | | | | | Null merge of Bug#51855 into mysql-trunk-merge.Davi Arnaut2010-07-230-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fixed bug #51855. Race condition in XA START. If several threadsDmitry Shulga2010-06-292-11/+25
| * | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-231-1/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Mergeunknown2010-07-223-4/+16
| | |\ \ \ \ \
| | * | | | | | Bug#49542 - Do as the comment suggests and downgrade directory errors from fi...unknown2010-07-221-5/+5
| * | | | | | | Auto-merge from mysql-trunk.Alexander Nozdrin2010-07-232-3/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ mergeGeorgi Kodinov2010-07-210-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | mergeGeorgi Kodinov2010-07-210-0/+0
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ mergeGeorgi Kodinov2010-07-210-0/+0
| | | |\ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ mergeGeorgi Kodinov2010-07-211-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ | | | |/| | | | | | |
| | | * | | | | | | | Merge the version number increase (5.1.49 -> 5.1.50) into the main tree.Joerg Bruehe2010-07-211-1/+1
| | | |\ \ \ \ \ \ \ \
| * | | \ \ \ \ \ \ \ \ mergeGeorgi Kodinov2010-07-212-3/+15
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Addendum #4 to bug #53095Georgi Kodinov2010-07-212-3/+15
| | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | * | | | | | | | | Automerge.Alexey Kopytov2010-07-211-1/+1
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ Automerge.Alexey Kopytov2010-07-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Automerge.Alexey Kopytov2010-07-211-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | |
| | | * | | | | | | | | | Bug#55061: Build failing on sol 8 x86 - assembler code vs Alexey Kopytov2010-07-121-1/+1
| * | | | | | | | | | | | Bug#52514: mysql 5.1 do_abi_check does not compile w/ gcc4.5Davi Arnaut2010-07-202-3/+3