summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* WL#751 Error message construction, backportSergey Glukhov2009-10-1564-570/+8009
* Backporting WL#4164 Two-byte collation IDsAlexander Barkov2009-10-1513-39/+102
* A postfix for backporting WL#1397 convert XML -> SQLAlexander Barkov2009-10-143-5/+4
* WL#1397 convert XML -> SQLAlexander Barkov2009-10-129-34/+859
* Merge from mysql-next-mr.Alexander Nozdrin2009-10-101-1/+1
|\
| * Merge. Backport WL#4085 from 6.0.Alexander Nozdrin2009-10-1084-15307/+66
| |\
| * \ Merge from mysql-trunk.Alexander Nozdrin2009-10-091-1/+1
| |\ \
| | * | Update version in default.conf.Alexander Nozdrin2009-10-091-1/+1
* | | | Merge from mysql-next-mr-alik (WL#4085).Alexander Nozdrin2009-10-0984-15307/+66
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-0934-663/+627
| |\ \ \ | | |/ /
| * | | Backport WL#4085: Merge revno:2617.56.29 from 6.0.Alexander Nozdrin2009-10-063-124/+60
| * | | Merge revno:2617.31.54 from 6.0.Alexander Nozdrin2009-10-0624-2077/+0
| * | | Backport WL#4085: Merge revno:2476.1338.9 from 6.0.Alexander Nozdrin2009-10-061-2/+6
| * | | Backport WL#4085: Merge revno:2476.1105.1 from 6.0.Alexander Nozdrin2009-10-0655-13103/+0
| * | | Backport WL#4085: Merge revno:2476.657.219 from 6.0.Alexander Nozdrin2009-10-061-1/+0
* | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-0934-663/+627
|\ \ \ \ | | |/ / | |/| |
| * | | Merge from mysql-trunk.Alexander Nozdrin2009-10-091-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | Change the version tag (to 5.5.0).Alexander Nozdrin2009-10-091-1/+1
| * | | Merge from mysql-trunk.Alexander Nozdrin2009-10-090-0/+0
| |\ \ \ | | |/ /
| | * | Fix default.cof.Alexander Nozdrin2009-10-091-1/+1
| * | | Merge from mysql-trunk-bugfixing.Alexander Nozdrin2009-10-091-0/+1
| |\ \ \ | | |/ /
| | * | Mark main.log_tables experimental (Bug 47924).Alexander Nozdrin2009-10-081-0/+1
| * | | Merge from mysql-trunk-bugfixing.Alexander Nozdrin2009-10-081-326/+0
| |\ \ \ | | |/ /
| | * | Fix index_merge_innodb.result (Bug 45727).Alexander Nozdrin2009-10-081-326/+0
| * | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-0850-446/+434
| |\ \ \ | | | |/ | | |/|
| * | | Merge from mysql-trunk-bugfixing.Alexander Nozdrin2009-10-071-6/+2
| |\ \ \ | | | |/ | | |/|
| | * | Disabled index_merge2.inc due to Bug 45727.Alexander Nozdrin2009-10-071-6/+2
| * | | Backport of the fix for BUG#33730 "Full table scan instead selected partition...Guilhem Bichot2009-10-054-14/+58
| * | | Port of fix for BUG#42893 "main.information_schema times out sporadically"Guilhem Bichot2009-10-054-123/+141
| * | | Merge from mysql-trunk-bugfixing.Alexander Nozdrin2009-10-021-0/+2
| |\ \ \ | | |/ /
| | * | Made two test cases experimental.Alexander Nozdrin2009-10-021-0/+2
| * | | Merge from mysql-trunk-bugfixing.Alexander Nozdrin2009-10-012-17/+25
| |\ \ \ | | |/ /
| | * | 1. Respect experimental tag in gcov mode;Alexander Nozdrin2009-10-012-17/+25
| | * | Update default.confAlexander Nozdrin2009-10-011-1/+1
| * | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-0114-880/+1618
| |\ \ \
| * \ \ \ Merge "trunk-build" up into "next-mr".Joerg Bruehe2009-09-307-15/+36
| |\ \ \ \
| | * \ \ \ Merge 5.1-build up into 5.4-build ("trunk-build").Joerg Bruehe2009-09-287-15/+36
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Upmerge 5.0-build -> 5.1-build.Joerg Bruehe2009-09-282-2/+3
| | | |\ \ \
| | | | * \ \ Merge the fix for bug#47137 into 5.0-buildJoerg Bruehe2009-09-281-1/+2
| | | | |\ \ \
| | | | | * | | Fix bug#47137Joerg Bruehe2009-09-171-1/+2
| | | | * | | | Merge from mysql-5.0.86-releaseunknown2009-09-211-1/+1
| | | | |\ \ \ \
| | | | | * | | | change c++ comment to c commenthery2009-09-091-1/+1
| | | | | |/ / /
| | | * | | | | Merge main 5.1 into 5.1-build (a fix from 5.1.39).Joerg Bruehe2009-09-281-0/+1
| | | |\ \ \ \ \
| | | * | | | | | Fix bug#46980Joerg Bruehe2009-09-176-13/+33
| | | * | | | | | Null-merge a version number change from 5.0 to 5.1Joerg Bruehe2009-09-150-0/+0
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | | * | | | | Raise version number after cloning 5.0.86unknown2009-09-081-2/+2
| | | | | |/ / / | | | | |/| | |
| * | | | | | | auto-mergeIngo Struewing2009-09-3013-142/+293
| |\ \ \ \ \ \ \
| | * | | | | | | Fix for BUG#42980 "Client doesn't set NUM_FLAG for DECIMAL and TIMESTAMP":Guilhem Bichot2009-09-3013-142/+293
| * | | | | | | | Bug#37267 - connect() EINPROGRESS failures mishandled in client libraryIngo Struewing2009-09-304-19/+68
| |/ / / / / / /
* | | | | | | | Bsckporting WL#3764 Sinhala CollationAlexander Barkov2009-10-064-0/+228