summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql-next-mr (revno 2939) --> mysql-next-mr-marcMarc Alff2009-12-175-33/+129
|\
| * Merge to latest mysql-next-mrMikael Ronstrom2009-12-164-26/+2
| |\
| * | Fix for Windows atomicsMikael Ronstrom2009-12-161-15/+19
| * | Fixed complex gcc assembler issues with 64-bit operations on 32-bit platforms...Mikael Ronstrom2009-12-151-18/+47
| * | Include windows.h in atomics framework for windowsMikael Ronstrom2009-12-151-0/+1
| * | Fixed 64-bit atomics on Win x86 and removed support for 8 and 16-bit atomic o...Mikael Ronstrom2009-12-152-16/+4
| * | Fixed atomic instruction headers for Windows and x86-gccMikael Ronstrom2009-12-152-4/+34
| * | MergeMikael Ronstrom2009-12-1418-43/+3842
| |\ \
| * \ \ Merged in WL#5138Mikael Ronstrom2009-11-273-8/+41
| |\ \ \
| | * \ \ Merge WL#5138 to mysql-next-mrMikael Ronstrom2009-11-2711-61/+477
| | |\ \ \
| | * \ \ \ WL#5138 merged to mysql-next-mrMikael Ronstrom2009-11-2010-215/+425
| | |\ \ \ \
| | | * | | | Backported my_atomic from 6.0-codebase and added support for 64-bit atomics t...Mikael Ronstrom2009-10-125-16/+63
| | | * | | | Moved atomics from 6.0 codebase to prepare for using atomic increments in pla...Mikael Ronstrom2009-10-097-203/+388
| * | | | | | Merge WL#5137 to mysql-next-mrMikael Ronstrom2009-11-271-0/+11
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | WL#5137, Remove hash calculation from LOCK_open in open_tableMikael Ronstrom2009-11-201-0/+11
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Review comments for LOCK_open patchMikael Ronstrom2009-11-101-4/+6
| | | * | | | A minor change to MySQL's hash where calculation of hash can be done separate...Mikael Ronstrom2009-10-091-0/+9
| | | |/ / /
* | | | | | Merge mysql-next-mr (revno 2942) --> mysql-next-mr-marcMarc Alff2009-12-164-26/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-161-4/+0
| |\ \ \ \ \
| | * | | | | Remove .cvsignore files (attempt #2).Alexander Nozdrin2009-12-161-4/+0
| * | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-123-22/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | / | | |_|_|_|/ | |/| | | |
| | * | | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-1144-488/+697
| | |\ \ \ \
| | * \ \ \ \ Automerge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-11-262-20/+0
| | |\ \ \ \ \
| | | * | | | | Post-merge fix for bug 41728: revert fix that was pushed in mistake to 5.1 an...Davi Arnaut2009-11-242-20/+0
| | * | | | | | Manual merge from the mysql-5.1-bugteam.Alexey Kopytov2009-11-241-2/+2
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Bug#47571 : idle named pipe connection is unkillableVladislav Vaintroub2009-11-201-2/+2
* | | | | | | | Merge cleanupMarc Alff2009-12-111-2/+0
* | | | | | | | Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marcMarc Alff2009-12-111-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-103-8/+8
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-0412-10/+3803
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-033-24/+30
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Auto-merge (pull) from mysql-next-mr.Alexander Nozdrin2009-11-262-0/+130
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| * | | | | | | | | | Manual merge/pull from mysql-next-mr.Alexander Nozdrin2009-11-256-52/+21
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-2311-218/+712
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge with next-mrKonstantin Osipov2009-11-203-10/+76
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| * | | | | | | | | | | | merging.Alexey Botchkov2009-11-171-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Bug#47126 equal flag values causing unexpected behaviourAlexey Botchkov2009-11-111-1/+1
* | | | | | | | | | | | | WL#2360 Performance schemaMarc Alff2009-12-095-22/+26
| |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
* | | | | | | | | | | | WL#2360 Performance schemaMarc Alff2009-12-043-8/+8
| |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge mysql-next-mr (revno 2937) --> mysql-next-mr-marcMarc Alff2009-12-033-24/+30
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
| * | | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-022-0/+130
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| * | | | | | | | | | Backport of WL#798 (MySQL IPv6 support) from 6.0.Alexander Nozdrin2009-11-253-24/+30
| | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | WL#2360 Performance schemaMarc Alff2009-11-3012-10/+3803
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-256-52/+21
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-2411-218/+712
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | Backport of:Konstantin Osipov2009-11-242-16/+5
| * | | | | | | | Backport of:Konstantin Osipov2009-11-232-34/+2
| * | | | | | | | Backport of:Konstantin Osipov2009-11-211-2/+13
| * | | | | | | | Backport the implementation of vio_pending from 6.0-codebase.Konstantin Osipov2009-11-211-0/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | WL#2373 Use cycle counter for timingMarc Alff2009-11-242-0/+130
| |/ / / / / / |/| | | | | |
View Lorry Controller Status