summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* mysql-5.1 -> mysql-5.5 mergeSergei Golubchik2010-11-051-2/+35
|\
| * mergeGeorgi Kodinov2010-10-051-2/+35
| |\
| | * Bug #56428: Replace copyright notice removed from SHA1 code (.h)Georgi Kodinov2010-10-051-2/+35
* | | Auto-merge from mysql-5.5-merge.Alexander Nozdrin2010-09-285-13/+19
|\ \ \
| * \ \ Merge 5.5 -> 5.5-merge.Konstantin Osipov2010-09-242-8/+15
| |\ \ \
| | * \ \ Merge 5.5.6-rc to the main tree.Joerg Bruehe2010-09-191-8/+10
| | |\ \ \
| | | * | | Bug#52419: x86 assembly based atomic CAS causes test failuresDavi Arnaut2010-09-171-8/+10
| | * | | | Automerge (most) changes of the 5.5.6-rc release build to main 5.5.Joerg Bruehe2010-09-103-3/+10
| | |\ \ \ \ | | | |/ / /
| | | * | | Cherry-picking patch for Bug#55846.Alexander Nozdrin2010-08-312-3/+5
| | | * | | Cherry-picking patch for Bug#55980.Alexander Nozdrin2010-08-311-0/+5
| * | | | | Auto-merge from mysql-5.1-bugteam.Dmitry Shulga2010-09-072-2/+4
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Fixed bug #47485 - mysql_store_result returns a not NULL result setDmitry Shulga2010-09-072-2/+4
| | * | | | Bug#55846: Link tests fail on Windows - my_compiler.h missingDavi Arnaut2010-08-241-2/+3
| * | | | | Auto-merge from mysql-5.5.Alexander Nozdrin2010-09-0110-2/+200
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Bug#55846: Link tests fail on Windows - my_compiler.h missingDavi Arnaut2010-08-312-3/+5
* | | | | | Fix for Bug#54478 "mysqld crashes during boot when running mtr with --debug o...Olav Sandstaa2010-09-151-1/+1
* | | | | | Auto-merge from mysql-5.5.Alexander Nozdrin2010-09-0110-2/+200
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Auto-merge from mysql-5.5-merge.Alexander Nozdrin2010-08-305-45/+292
| |\ \ \ \ \ | | |/ / / /
| * | | | | Merging with mysql-5.5Mats Kindahl2010-08-231-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merging with mysql-5.5-stage.Mats Kindahl2010-08-169-2/+179
| |\ \ \ \ \ \
| | * | | | | | WL#5363: Thread Pool Service InterfaceMats Kindahl2010-06-0710-9/+179
* | | | | | | | Bug#55980 Character sets: supplementary character _bin ordering is wrongAlexander Nozdrin2010-08-311-0/+5
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge fix for BUG52821 to 5.5-bugfixing.Sergey Vojtovich2010-08-272-46/+242
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | BUG#52821 - plugin_ftparser.h and plugin_audit.h areSergey Vojtovich2010-08-272-46/+242
* | | | | | | Manual merge from mysql-5.5-bugfixing to mysql-5.5-runtime.Jon Olav Hauglid2010-08-184-5/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Auto-merge from mysql-5.5.Alexander Nozdrin2010-08-181-1/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Auto-merge from mysql-5.5.Alexander Nozdrin2010-08-161-4/+4
| | |\ \ \ \ \ | | | |/ / / /
| | * | | | | mergeGeorgi Kodinov2010-08-052-2/+2
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Bug #42144: plugin_load failsGeorgi Kodinov2010-08-041-1/+1
| | * | | | | Auto-merge from mysql-5.5.Alexander Nozdrin2010-08-0421-1043/+96
| | |\ \ \ \ \
| | * \ \ \ \ \ mergeGeorgi Kodinov2010-08-031-1/+1
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Bug #42144: plugin_load failsGeorgi Kodinov2010-08-031-1/+1
| * | | | | | | Merge mysql-5.5-bugfixing -> mysql-5.5-innodbVasil Dimov2010-08-189-28/+19
| |\ \ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Patch for Bug#55854 (MySQL AB should not be AUTHOR, copyright incorrect).Alexander Nozdrin2010-08-121-4/+4
| | | |_|/ / / | | |/| | | |
| * | | | | | Fix bug #53496 Use Lock_time in slow query log output for InnoDB rowJimmy Yang2010-08-172-0/+2
* | | | | | | A pre-requisite patch for the fix for Bug#52044.Konstantin Osipov2010-08-112-0/+28
| |/ / / / / |/| | | | |
* | | | | | Auto-merge from mysql-trunk-merge.Alexander Nozdrin2010-07-297-8/+12
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Bug#52514: mysql 5.1 do_abi_check does not compile w/ gcc4.5Davi Arnaut2010-07-203-3/+5
| * | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-202-4/+5
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-202-3/+6
| * | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-202-1/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Bug#52514: mysql 5.1 do_abi_check does not compile w/ gcc4.5Davi Arnaut2010-07-202-1/+2
* | | | | | Merge trunk-bugfixing -> trunk-runtime.Konstantin Osipov2010-07-2720-1027/+93
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Bug#52261: 64 bit atomic operations do not work on Solaris i386 ..Davi Arnaut2010-07-271-1/+7
| * | | | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-233-61/+11
| * | | | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-232-32/+14
| * | | | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-231-24/+0
| * | | | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-232-173/+9
| * | | | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-232-10/+0
| * | | | | WL#5498: Remove dead and unused source codeDavi Arnaut2010-07-235-24/+3