summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-trunk.Alexander Nozdrin2009-12-117-59/+77
|\
| * Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-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
| | |\ \ \ \
| | * \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-144-0/+6
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | 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
| |/ / / / /
| * | | | | WL#2110 (SIGNAL)Marc Alff2009-09-104-21/+25
* | | | | | 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
* | | | | | 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-5.1.Alexander Nozdrin2009-10-191-2/+11
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | Bug #47795 CMake, storage engine name different from directory nameMagnus Blåudd2009-10-081-2/+11
* | | | | 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
* | | | merge of 5.1-main into mysql-trunk.Guilhem Bichot2009-08-123-16/+34
|\ \ \ \ | |/ / /
| * | | Merge mysql-5.1-innodb_plugin to mysql-5.1.Sergey Vojtovich2009-08-111-53/+6
| |\ \ \
| * \ \ \ Auto-mergeIgnacio Galarza2009-07-311-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Bug#17270 - mysql client tool could not find ../share/charsets folder and fails.Ignacio Galarza2009-07-311-1/+1
| | * | | Merge chunk from trunk.Chad MILLER2008-07-101-0/+10
| | |\ \ \
| | * \ \ \ Merge chunk from trunk.Chad MILLER2008-07-101-0/+2
| | |\ \ \ \
| | * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-12-101-0/+1
| | |\ \ \ \ \
| | | * \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-09-101-0/+1
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2007-07-021-0/+1
| | | | |\ \ \ \ \
| * | | | | | | | | Bug#44521 Prepared Statement: CALL p() - crashes: `! thd->main_da.is_sent' fa...Kristofer Pettersson2009-07-301-1/+1
View Lorry Controller Status