summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-03-072-0/+7
|\
| * Workaround the pthread_once_t static initialization. Per theDavi Arnaut2010-02-261-1/+2
| * Bug #45058 init_available_charsets uses double checked lockingStaale Smedseng2010-02-262-0/+6
* | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-02-091-4/+4
|\ \ | |/
| * Recommit of Bug#49447.Staale Smedseng2010-02-041-4/+4
* | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-01-241-0/+9
|\ \ | |/
| * WL#5154 Remove deprecated 4.1 featuresMagne Mahre2010-01-211-0/+9
* | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-241-0/+3
|\ \
| * \ Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-195-56/+84
| |\ \
| * \ \ Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-164-24/+14
| |\ \ \
| * | | | Backporting patch for Bug#47756Alexander Nozdrin2009-12-151-0/+3
* | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-232-3/+3
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| |
| * | | Manual merge.Davi Arnaut2009-12-182-3/+3
| |\ \ \
| | * | | Bug#48983: Bad strmake calls (length one too long)Davi Arnaut2009-12-172-3/+3
* | | | | Automerge from mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2009-12-171-1/+5
|\ \ \ \ \ | |/ / / /
| * | | | merge mysql-5.0-bugteam to mysql-5.1-bugteamSatya B2009-12-171-1/+5
| |\ \ \ \ | | |/ / /
| | * | | Fix for Bug#37408 - Compressed MyISAM files should not require/use mmap()Satya B2009-12-171-1/+5
* | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-163-54/+59
|\ \ \ \ \ | |/ / / /
| * | | | Bug#49134 5.1 server segfaults with 2byte collation fileAlexander Barkov2009-12-151-1/+2
| * | | | Bug #45058 init_available_charsets uses double checked lockingStaale Smedseng2009-12-123-53/+57
* | | | | Auto-merge from mysql-trunk.Alexander Nozdrin2009-12-161-10/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Remove .cvsignore files (attempt #2).Alexander Nozdrin2009-12-161-10/+0
* | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-111-1/+20
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge from 5.0Staale Smedseng2009-12-061-1/+20
| |\ \ \ | | |/ /
* | | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-1141-563/+1560
|\ \ \ \ | | |_|/ | |/| |
| * | | Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-102-0/+32
| |\ \ \
| | * \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-053-18/+41
| | |\ \ \
| | * | | | WL#4903 Plugin Service API part ISergei Golubchik2009-11-021-0/+23
| | * | | | backport of dbug extensions from 6.0:Sergei Golubchik2009-10-301-0/+9
| * | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-062-2/+7
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | 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
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-146-13/+38
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | 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
| | |\ \ \ \ \ \ \