summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-062-2/+7
|\
| * Manual merge from mysql-5.1.Alexander Nozdrin2009-11-052-2/+7
| |\
| | * Bug#46586: When using the plugin interface the type "set" for options caused ...Tatiana A. Nurnberg2009-10-272-2/+7
| | * Upmerge a Windows compile fix from 5.0 to 5.1.Joerg Bruehe2009-10-161-1/+1
| | |\
* | | \ Manual merge from mysql-next-mr.Alexander Nozdrin2009-11-021-9/+32
|\ \ \ \
| * \ \ \ Automerge from mysql-next-mr.Alexander Nozdrin2009-10-274-10/+76
| |\ \ \ \
| * | | | | Fix for bug #45143 "All connections hang on concurrent ALTER TABLE".Dmitry Lenev2009-10-261-9/+32
* | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-284-10/+76
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeLuis Soares2009-10-224-10/+76
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Backport post fix compiler warnings and test failures for BUG#25192 BUG#12190He Zhenxing2009-10-021-2/+2
| | * | | | Backport BUG#25192 Using relay-log and relay-log-index without values produce...He Zhenxing2009-10-022-10/+68
| | * | | | WL#5016: Fix header file include guardsMats Kindahl2009-09-232-0/+8
* | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-2314-76/+71
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merging mysql-next-mr-merge to mysql-next-mr.Alexander Barkov2009-10-213-16/+23
| |\ \ \ \ \
| | * | | | | WL#751 Error message construction, backportSergey Glukhov2009-10-152-11/+18
| | * | | | | Backporting WL#4164 Two-byte collation IDsAlexander Barkov2009-10-151-5/+5
| * | | | | | Merge from mysql-trunk-merge.Alexander Nozdrin2009-10-194-47/+6
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge from mysql-5.1.Alexander Nozdrin2009-10-191-0/+4
| | |\ \ \ \ \
| | | * \ \ \ \ Upmerge the Windows compile fix from 5.0 to 5.1Joerg Bruehe2009-10-161-1/+1
| | | |\ \ \ \ \ | | | | |_|_|/ / | | | |/| | | / | | | | | |_|/ | | | | |/| |
| | | | * | | Compile fix for Windows:Joerg Bruehe2009-10-161-1/+1
| | | * | | | Upmerge (automerge) into 5.1Joerg Bruehe2009-10-091-0/+4
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Fix bug#47923 New "mf_keycache.c" requires thread supportJoerg Bruehe2009-10-081-0/+4
| | | | * | | Bug#47768 pthread_cond_timedwait() is broken on windowsKristofer Pettersson2009-10-061-1/+1
| | | | * | | Merge bug#42850 to 5.0Magnus Blåudd2009-09-281-3/+4
| | | | |\ \ \
| | * | | \ \ \ Merge from mysql-5.1.Alexander Nozdrin2009-10-193-47/+2
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Bug#47857 strip_sp function in mysys/mf_strip.c never used and cause name clashMagnus Blåudd2009-10-063-47/+2
| * | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-146-13/+38
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | / / | | |_|_|_|/ / | |/| | | | |
| | * | | | | Merge from mysql-5.1.Alexander Nozdrin2009-10-141-2/+1
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | AutomergKristofer Pettersson2009-10-064-4/+41
| | | |\ \ \ \
| | * | \ \ \ \ Merge from mysql-5.1.Alexander Nozdrin2009-10-136-13/+47
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | automergeGeorgi Kodinov2009-10-041-2/+10
| | | |\ \ \ \ \
| | | * \ \ \ \ \ auto-mergeIngo Struewing2009-10-012-0/+30
| | | |\ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | | * | | | | WL#4259 - Debug Sync FacilityIngo Struewing2009-09-292-0/+30
| | | * | | | | | Merge bug#42850 to 5.1Magnus Blåudd2009-09-281-3/+4
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Merge bug#42850 to 5.0Magnus Blåudd2009-09-281-3/+4
| | | | |\ \ \ \ \ | | | | | |_|/ / / | | | | |/| | / / | | | | | | |/ / | | | | | |/| |
| | | | | * | | Bug#42850 race condition in my_thr_init.cMagnus Blåudd2009-09-241-3/+4
| | | | * | | | fixed compilation warningsGeorgi Kodinov2009-09-241-1/+1
| | | * | | | | Automerge.Alexey Kopytov2009-09-181-1/+1
| | | |\ \ \ \ \
| | | | * | | | | Bug #43606: 4GB Limit on huge_pages shared memory set-upAlexey Kopytov2009-09-181-1/+1
| | | * | | | | | Merge from 5.0Staale Smedseng2009-09-171-7/+2
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | | * | | | | Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-09-171-5/+2
| * | | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-091-2/+10
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Bsckporting WL#3764 Sinhala CollationAlexander Barkov2009-10-061-0/+4
* | | | | | | | | | Backport of:Konstantin Osipov2009-10-141-8/+8
* | | | | | | | | | Backport of:Konstantin Osipov2009-10-141-1/+1
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-088-111/+117
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge from mysq-next-mr-wtf.Alexander Nozdrin2009-10-027-111/+114
| |\ \ \ \ \ \ \ \
| | * | | | | | | | backport of Vladislav Vaintroub2009-09-303-8/+14
| | * | | | | | | | Backport of this changeset Vladislav Vaintroub2009-09-303-76/+101
| | * | | | | | | | Backport http://lists.mysql.com/commits/57778Vladislav Vaintroub2009-09-301-2/+0
View Lorry Controller Status