summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | Merging with mysql-5.1-rep+2Mats Kindahl2009-12-151-1/+1
| |\ \ \ \ \ \ \
| | * | | | | | | WL#5151: Conversion between different types when replicatingMats Kindahl2009-12-141-1/+1
| * | | | | | | | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Andrei Elkin2009-11-301-0/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ merging 5.1 main -> rpl+2. Some manual work required mostly due to bug46640Andrei Elkin2009-11-064-2/+17
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
* | | | | | | | | | Auto-merge from mysql-trunk-bugfixing.Alexander Nozdrin2009-12-231-0/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Fix build error with CMake 2.8 (mysql_stmt_next_result not exported Vladislav Vaintroub2009-12-221-0/+1
* | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-121-1/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | / / / / | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-117-59/+77
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | |
| * | | | | | | | Automerge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2009-11-261-1/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | Post-merge fix for bug 41728: revert fix that was pushed in mistake to 5.1 an...Davi Arnaut2009-11-241-1/+0
| | | |_|_|/ / / | | |/| | | | |
* | | | | | | | Merge with next-mrKonstantin Osipov2009-11-201-0/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Manual merge of mysql-next-mr-runtime upstream.Davi Arnaut2009-11-191-0/+1
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Backport of Bug#47304 to mysql-next-mrDavi Arnaut2009-11-101-0/+1
| | | |_|_|_|/ | | |/| | | |
* | | | | | | Bug#32115: Bad use of Name_resolution_context from current LEX in partitioningMattias Jonsson2009-11-201-1/+0
|/ / / / / /
* | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Auto-merge from mysql-5.1.Alexander Nozdrin2009-11-051-0/+1
| |\ \ \ \ | | |/ / /
| | * | | Automerge.Davi Arnaut2009-11-021-0/+1
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Bug#41728: Dropped symbol but no soname changeDavi Arnaut2009-09-291-0/+1
* | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-282-2/+3
|\ \ \ \ \
| * \ \ \ \ manual merge: mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeLuis Soares2009-10-222-2/+3
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Backporting WL#4398 WL#1720He Zhenxing2009-09-262-1/+3
* | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-234-3/+26
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merging mysql-next-mr-merge to mysql-next-mr.Alexander Barkov2009-10-211-1/+9
| |\ \ \ \ \
| | * | | | | WL#751 Error message construction, backportSergey Glukhov2009-10-151-1/+9
| * | | | | | Merge from mysql-trunk-merge.Alexander Nozdrin2009-10-191-2/+11
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge from mysql-5.1.Alexander Nozdrin2009-10-191-2/+11
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Bug #47795 CMake, storage engine name different from directory nameMagnus BlÄudd2009-10-081-2/+11
| * | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-144-0/+6
| |\ \ \ \ \ \ | | |/ / / / / | | | | / / / | | |_|/ / / | |/| | | |
| | * | | | Merge from mysql-5.1.Alexander Nozdrin2009-10-134-0/+6
| | |\ \ \ \ | | | |/ / /
| | | * | | auto-mergeIngo Struewing2009-10-021-0/+3
| | | |\ \ \
| | | | * \ \ mergingAlexey Botchkov2009-09-295-69/+41
| | | | |\ \ \
| | | | * | | | Bug#43733 Select on processlist let the embedded server crash (concurren...Alexey Botchkov2009-06-041-0/+3
| | | * | | | | auto-mergeIngo Struewing2009-10-012-0/+2
| | | |\ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | | * | | | WL#4259 - Debug Sync FacilityIngo Struewing2009-09-292-0/+2
| | | | | |/ / | | | | |/| |
| | | * | | | mergeGeorgi Kodinov2009-09-251-0/+1
| | | |\ \ \ \ | | | | |/ / / | | | |/| | / | | | | | |/ | | | | |/|
| | | | * | Bug #45159 : some tests in suite "jp" fail in embedded server (use LOAD DATA)Georgi Kodinov2009-09-111-0/+1
* | | | | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,Konstantin Osipov2009-10-221-5/+5
* | | | | | Bug #44651 "have_community_features" variable should be renamed Jon Olav Hauglid2009-10-091-2/+2
* | | | | | Bug #33831 mysql_real_connect() connects again if Magne Mahre2009-10-091-12/+9
* | | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-092-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-083-13/+25
| |\ \ \ \ \
| * \ \ \ \ \ auto-mergeIngo Struewing2009-09-301-1/+1
| |\ \ \ \ \ \
| | * | | | | | Fix for BUG#42980 "Client doesn't set NUM_FLAG for DECIMAL and TIMESTAMP":Guilhem Bichot2009-09-301-1/+1
| * | | | | | | Bug#37267 - connect() EINPROGRESS failures mishandled in client libraryIngo Struewing2009-09-301-1/+1
| |/ / / / / /
* | | | | | | Backport the following revision from 6.0:Konstantin Osipov2009-10-091-4/+0
| |/ / / / / |/| | | | |
* | | | | | Merge from mysq-next-mr-wtf.Alexander Nozdrin2009-10-022-13/+1
|\ \ \ \ \ \
| * | | | | | Backport of this changeset Vladislav Vaintroub2009-09-301-1/+1
| * | | | | | Backport http://lists.mysql.com/commits/57778Vladislav Vaintroub2009-09-301-3/+0
| * | | | | | Windows improvements : manual backport of Vladislav Vaintroub2009-09-302-9/+0
| |/ / / / /
* | | | | | Backporting WL#3759 Optimize identifier conversion in client-server protocolAlexander Barkov2009-09-301-0/+24
|/ / / / /