summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-103-8/+8
| |\
| | * WL#2360 Performance schemaMarc Alff2009-12-043-8/+8
| * | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-12-0412-10/+3803
| |\ \ | | |/
| | * Merge mysql-next-mr (revno 2937) --> mysql-next-mr-marcMarc Alff2009-12-033-24/+30
| | |\
| | * | WL#2360 Performance schemaMarc Alff2009-11-3012-10/+3803
| * | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-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
| * | | 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
* | | | | | | 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
| | |/ / / / /
* | | | | | | 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
| |/ / / / |/| | | |
* | | | | Merge mysql-next-mr (revno 2923) --> mysql-next-mr-marcMarc Alff2009-11-203-10/+76
|\ \ \ \ \ | |/ / / /
| * | | | Manual merge of mysql-next-mr-runtime upstream.Davi Arnaut2009-11-193-10/+76
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Bug #33544 UDF_INIT member decimals initialized wrong with Magne Mahre2009-11-111-0/+1
| | |\ \ \
| | | * | | Bug #33544: UDF_INIT member decimals initialized wrong with unknown2008-03-051-0/+1
| | * | | | Fix of incorrect casting for large sizesMagne Mahre2009-11-111-8/+7
| | * | | | Bug #14637: trim trailing spaces processes data only byte wiseMagne Mahre2009-11-111-0/+70
| | * | | | Backport of Bug#41860 to mysql-next-mrDavi Arnaut2009-11-101-11/+6
| | * | | | Backport of Bug#10374 to mysql-next-mrDavi Arnaut2009-11-101-0/+1
* | | | | | WL#3230 concurrent hashMarc Alff2009-11-173-1/+282
* | | | | | Misc cleanupMarc Alff2009-11-172-97/+1
* | | | | | WL#2595 kernel-independent atomic operationsMarc Alff2009-11-178-121/+430
|/ / / / /
* | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-1012-264/+409
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-057-238/+50
| |\ \ \ \ | | |/ / /
| * | | | unit tests for my_vsnprintf,Sergei Golubchik2009-11-041-1/+1
| * | | | WL#4903 Plugin Service API part ISergei Golubchik2009-11-029-155/+326
| * | | | backport of dbug extensions from 6.0:Sergei Golubchik2009-10-303-109/+83
* | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-064-2/+30
|\ \ \ \ \ | |_|/ / / |/| | | |