summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | Merge from mysql-next-mr.Alexander Nozdrin2009-10-083-13/+25
|\ \ \ \ \
| * \ \ \ \ 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
| |/ / / / /
* | | | | | 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
|/ / / / /
* | | | | WL#2110 (SIGNAL)Marc Alff2009-09-104-21/+25
|/ / / /
* | | | 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
| * | | | | | | | | Bug#44521 Executing a stored procedure as a prepared statement can sometimes ...Kristofer Pettersson2009-07-291-13/+21
| * | | | | | | | | Post-merge fix for Bug#43587: Handle failures to execute a statementDavi Arnaut2009-07-271-2/+12
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Creation of mysql-trunk = {summit + "Innodb plugin replacing the builtin"}:Guilhem Bichot2009-08-041-53/+6
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Backport WL#3653 to 5.1 to enable bundled innodb plugin.Vladislav Vaintroub2009-06-101-53/+6
| |/ / / / / / /
* | | | | | | | Merge MySQL 5.1.35 into MySQL 5.4Mikael Ronstrom2009-06-113-4/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Bug #43715 Link errors when trying to link mysql_embedded.exeVladislav Vaintroub2009-03-172-4/+4
| * | | | | | | merging.Alexey Botchkov2009-02-241-0/+9
| |\ \ \ \ \ \ \
| | * | | | | | | Bug#39289 libmysqld.a calls exit() upon error Alexey Botchkov2008-10-271-0/+9
* | | | | | | | | Merged Performance Version 0.2.1 with latest 5.1 tree (last push 11 feb 14.01...Mikael Ronstrom2009-02-172-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Fix merge error, mysqltest.cc should be mysqltest.cMagnus Svensson2008-12-181-1/+1
| * | | | | | | | merge 5.1 --> 5.1-rplAlfranio Correia2008-12-133-76/+8
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge 5.1 main -> 5.1-rplHe Zhenxing2008-09-061-0/+3
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Ad missing ) to CmakeLists.txtMagnus Svensson2008-08-091-1/+1
| * | | | | | | | | MergeMagnus Svensson2008-08-081-1/+2
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Bug #38181 Please print more debug info when tests failMagnus Svensson2008-08-042-2/+2
* | | | | | | | | | | Merge dtrace patch with latest performance versionMikael Ronstrom2008-12-203-75/+7
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Bug#38522: 5 seconds delay when closing application using embedded serverVladislav Vaintroub2008-12-043-135/+5
| * | | | | | | | | | Fix broken link in embedded server (Windows)Vladislav Vaintroub2008-11-211-3/+3
| * | | | | | | | | | Bug#38293 Libmysqld crash in mysql_library_init if language file missingAlexey Botchkov2008-11-191-3/+3
| * | | | | | | | | | mergingAlexey Botchkov2008-11-192-3/+63
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug#38293 Libmysqld crash in mysql_library_init if language file missingAlexey Botchkov2008-11-192-3/+63
| | | |_|/ / / / / / / | | |/| | | | | | | |