summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-12-111-1/+1
|\
| * Merge from 5.0Staale Smedseng2009-12-061-1/+1
| |\
* | \ Manual merge from mysql-trunk.Alexander Nozdrin2009-12-1144-488/+697
|\ \ \
| * \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-1012-264/+409
| |\ \ \
| | * \ \ Auto-merge from mysql-next-mr.Alexander Nozdrin2009-11-057-238/+50
| | |\ \ \
| | * | | | unit tests for my_vsnprintf,Sergei Golubchik2009-11-041-1/+1
| | * | | | WL#4903 Plugin Service API part ISergei Golubchik2009-11-029-155/+326
| | * | | | backport of dbug extensions from 6.0:Sergei Golubchik2009-10-303-109/+83
| * | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-064-2/+30
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | 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
| |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / | | |/| | | | | |
| | * | | | | | | Automerge from mysql-next-mr.Alexander Nozdrin2009-10-2727-4/+208
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeLuis Soares2009-10-2227-4/+208
| | | |\ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | | * | | | | Manual merge semi-sync to 5.1-rep+2He Zhenxing2009-10-032-1/+88
| | | | |\ \ \ \ \
| | | | | * | | | | Backporting WL#4398 WL#1720He Zhenxing2009-09-262-1/+88
| | | | * | | | | | Backport BUG#25192 Using relay-log and relay-log-index without values produce...He Zhenxing2009-10-021-0/+1
| | | | * | | | | | WL#4828 and BUG#45747Alfranio Correia2009-09-291-0/+19
| | | | * | | | | | WL#5016: Fix header file include guardsMats Kindahl2009-09-2323-3/+100
| | | | |/ / / / /
| | * | | | | | | Automerge from mysql-next-mr.Alexander Nozdrin2009-10-233-10/+13
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | * | | | | | | WL#1349 Use operating system localization to send it as a default client char...Alexander Barkov2009-10-211-0/+2
| * | | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-236-15/+25
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merging mysql-next-mr-merge to mysql-next-mr.Alexander Barkov2009-10-215-5/+12
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | A postfix for WL#751Alexander Barkov2009-10-161-0/+1
| | | * | | | | | WL#751 Error message construction, backportSergey Glukhov2009-10-152-1/+6
| | | * | | | | | Backporting WL#4164 Two-byte collation IDsAlexander Barkov2009-10-153-4/+5
| | | | |/ / / / | | | |/| | | |
| | * | | | | | Merge from mysql-trunk-merge.Alexander Nozdrin2009-10-191-1/+0
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-143-9/+13
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge with next-mr-runtime.Konstantin Osipov2009-10-221-1/+11
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Pull from mysql-next-mr-runtime.Alexander Nozdrin2009-10-163-185/+12
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Backporting revision from 6.0:Alexander Nozdrin2009-10-161-1/+11
| * | | | | | | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,Konstantin Osipov2009-10-223-2/+11
| | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Backport of:Konstantin Osipov2009-10-161-4/+0
| * | | | | | | | | Backport of:Konstantin Osipov2009-10-162-146/+12
| * | | | | | | | | Backport of:Konstantin Osipov2009-10-161-35/+0
| |/ / / / / / / /
| * | | | | | | | Backport of:Konstantin Osipov2009-10-141-34/+0
| * | | | | | | | Introduce thd->query_cache_tls (threadKonstantin Osipov2009-10-132-4/+3
| * | | | | | | | Bug #44651 "have_community_features" variable should be renamed Jon Olav Hauglid2009-10-091-1/+0
| * | | | | | | | Bug #33831 mysql_real_connect() connects again if Magne Mahre2009-10-091-1/+2
| * | | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-091-3/+5
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-084-36/+16
| | |\ \ \ \ \ \ \
| | * | | | | | | | Fix for BUG#42980 "Client doesn't set NUM_FLAG for DECIMAL and TIMESTAMP":Guilhem Bichot2009-09-301-3/+5
| * | | | | | | | | Backport to 5.4 the following changesets:Konstantin Osipov2009-10-092-10/+10
| | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge from mysq-next-mr-wtf.Alexander Nozdrin2009-10-023-36/+14
| |\ \ \ \ \ \ \ \
| | * | | | | | | | backport of Vladislav Vaintroub2009-09-302-8/+3
| | * | | | | | | | Backport of this changeset Vladislav Vaintroub2009-09-302-7/+8
| | * | | | | | | | Windows improvements : manual backport of Vladislav Vaintroub2009-09-301-21/+3
| | |/ / / / / / /