summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Fix my_atomic.h on Solaris, do not redefine macros already definedVladislav Vaintroub2009-12-051-0/+2
* mergeVladislav Vaintroub2009-12-0415-34/+3833
|\
| * 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
| | |/ | |/|
* | | mergeVladislav Vaintroub2009-11-302-0/+130
|\ \ \ | |/ /
| * | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-256-52/+21
| |\ \ | | |/
| * | WL#2373 Use cycle counter for timingMarc Alff2009-11-242-0/+130
* | | mergeVladislav Vaintroub2009-11-256-53/+20
|\ \ \ | | |/ | |/|
| * | 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
* | | mergeVladislav Vaintroub2009-11-2511-218/+712
|\ \ \ | | |/ | |/|
| * | Merge mysql-next-mr (revno 2923) --> mysql-next-mr-marcMarc Alff2009-11-203-10/+76
| |\ \ | | |/
| * | 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
* | | mergeVladislav Vaintroub2009-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 gkodinov/kgeorge@magare.gmz2008-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
* | | | automergeVladislav Vaintroub2009-11-134-2/+30
|\ \ \ \ | |/ / /
| * | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-1012-264/+409
| |\ \ \
| * \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-064-2/+30
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-052-0/+20
| | |\ \ \
| | | * \ \ mergeVladislav Vaintroub2009-11-033-0/+24
| | | |\ \ \
| | | | * \ \ Automerge.Davi Arnaut2009-11-022-0/+20
| | | | |\ \ \
| | | | | * | | Bug#41728: Dropped symbol but no soname changeDavi Arnaut2009-09-292-72/+84
| | * | | | | | Manual merge from mysql-5.1.Alexander Nozdrin2009-11-051-0/+4
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | A follow-up to fix forSergey Vojtovich2009-10-271-0/+4
| | * | | | | | Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-051-2/+6
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Bug#47571: idle named pipe connection is unkillableVladislav Vaintroub2009-11-021-2/+6
| | | |/ / / /
* | | | | | | WL#5161 : Cross-platform build with CMakeVladislav Vaintroub2009-11-098-29/+200
| |_|_|_|/ / |/| | | | |
* | | | | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-057-238/+50
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-11-021-0/+1
| |\ \ \ \ \
| | * \ \ \ \ Automerge from mysql-next-mr.Alexander Nozdrin2009-10-281-0/+2
| | |\ \ \ \ \
| | * \ \ \ \ \ Automerge from mysql-next-mr.Alexander Nozdrin2009-10-2727-4/+208
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Automerge from mysql-next-mr.Alexander Nozdrin2009-10-226-15/+25
| | |\ \ \ \ \ \ \
| | * | | | | | | | Backport WL#4098 from 6.0.Alexander Nozdrin2009-10-211-0/+1
| * | | | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-2828-4/+210
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| * | | | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-236-15/+25
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge with next-mr-runtime.Konstantin Osipov2009-10-221-1/+11
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Pull from mysql-next-mr-runtime.Alexander Nozdrin2009-10-163-185/+12
| | |\ \ \ \ \ \ \ \ \