summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge from mysql-next-mr.Alexander Nozdrin2009-10-088-111/+117
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge "trunk-build" up into "next-mr".Joerg Bruehe2009-09-301-2/+10
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge 5.1-build up into 5.4-build ("trunk-build").Joerg Bruehe2009-09-281-2/+10
| | |\ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | / | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Fix bug#46980Joerg Bruehe2009-09-171-2/+10
* | | | | | | | | Bsckporting WL#3764 Sinhala CollationAlexander Barkov2009-10-061-0/+4
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | 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
| * | | | | | | | Backport of the patch Vladislav Vaintroub2009-09-301-0/+2
| * | | | | | | | Windows improvements : manual backport of Vladislav Vaintroub2009-09-302-28/+0
| |/ / / / / / /
* | | | | | | | Backporting WL#3759 Optimize identifier conversion in client-server protocolAlexander Barkov2009-09-301-0/+3
|/ / / / / / /
* | | | | | | merge mysql-next-mr-alikVladislav Vaintroub2009-09-243-16/+14
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge mysql-next-mr (revno 2880) --> mysql-trunk-signalMarc Alff2009-09-201-52/+96
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | Merge mysql-next-mr --> mysql-trunk-signalMarc Alff2009-09-177-13/+29
| |\ \ \ \ \ \ \
| * | | | | | | | WL#2110 (SIGNAL)Marc Alff2009-09-103-16/+14
* | | | | | | | | mergeVladislav Vaintroub2009-09-231-0/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fix compile error. definition of VOID in trunk still conflicts with windows h...Vladislav Vaintroub2009-09-131-0/+8
* | | | | | | | | | mergeVladislav Vaintroub2009-09-238-65/+125
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | / / / / / / | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge 5.1-bugteam -> trunk-alik.Alexander Nozdrin2009-09-171-52/+96
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | / / / / | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Bug#17332 - changing key_buffer_size on a running serverIngo Struewing2009-09-091-52/+96
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | / / | | | |_|_|/ / | | |/| | | |
View Lorry Controller Status