summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
* Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-2111-13/+110
|\
| * Updated/added copyright headersKent Boortz2011-07-031-2/+26
| |\
| | * Bug#11764633 : 57491: THD->MAIN_DA.IS_OK() ASSERT IN EMBEDDEDMayank Prasad2011-05-181-2/+26
| * | Updated/added copyright headersKent Boortz2011-06-3010-11/+84
| |\ \ | | |/ | |/|
| | * Updated/added copyright headersKent Boortz2011-06-302-5/+7
* | | support for plugins on windowsSergei Golubchik2011-10-041-15/+12
* | | Added calls to cleanup_mutexes() for embedded library.Michael Widenius2011-04-281-0/+2
* | | Fixed build failuresMichael Widenius2011-02-231-0/+6
* | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-14/+0
|\ \ \ | |/ /
| * | MergeKent Boortz2010-12-292-14/+15
| |\ \ | | |/
| | * - Added/updated copyright headersKent Boortz2010-12-282-14/+15
| | * Bug#48983: Bad strmake calls (length one too long)Davi Arnaut2009-12-171-1/+1
* | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64Vladislav Vaintroub2010-12-061-2/+0
* | | Fixed compiler and gmake warningsMichael Widenius2010-11-291-3/+0
* | | MWL#74: Shared libmysqld.so library.unknown2010-11-172-110/+21
* | | Merge with MySQL 5.1.50Michael Widenius2010-08-272-4/+2
|\ \ \ | |/ /
| * | Fix for bug #50667: The InnoDB plugin prevents initializationRamil Kalimullin2010-07-161-1/+2
* | | Remove the file libmysqld.exp from the installerBo Thorsen2010-07-011-2/+0
* | | Hardcode the build path for the installer temporarilyBo Thorsen2010-07-011-1/+2
* | | Fix cpack runBo Thorsen2010-07-011-1/+1
* | | Install the files for the embedded serverBo Thorsen2010-06-281-0/+5
* | | Fix windows build of embedded server (forgotten dependency).unknown2010-01-311-1/+1
* | | Merge with MySQL 5.1.42Michael Widenius2010-01-151-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 MySQL 5.1, with following additions:unknown2009-11-165-1/+18
|\ \ \ | |/ /
| * | Automerge.Davi Arnaut2009-11-021-0/+1
| |\ \ | | |/
| | * Bug#41728: Dropped symbol but no soname changeDavi Arnaut2009-09-291-0/+1
| * | Bug #47795 CMake, storage engine name different from directory nameMagnus BlÄudd2009-10-081-2/+11
| * | 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
* | | | Added federatedx storage engineMichael Widenius2009-10-301-1/+1
* | | | Fix a problem in windows build introduced a few csets ago (inSergey Petrunya2009-10-051-0/+1
* | | | Fix embedded build on Windows: contents of storage/xtradb think they areSergey Petrunya2009-10-031-2/+2
* | | | Fix embedded server windows build: add opt_table_elimination.cc to list of filesSergey Petrunya2009-10-011-0/+1
* | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-151-1/+1
|\ \ \ \
| * \ \ \ Merge maria-5.1 -> maria-5.1-table-eliminationSergey Petrunya2009-08-141-1/+1
| |\ \ \ \
| | * | | | MWL#17: Table eliminationSergey Petrunia2009-06-251-1/+1
* | | | | | Merge MySQL->MariaDBSergey Petrunya2009-09-084-79/+40
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Merge mysql-5.1-innodb_plugin to mysql-5.1.Sergey Vojtovich2009-08-111-53/+6
| |\ \ \ \
| | * | | | Backport WL#3653 to 5.1 to enable bundled innodb plugin.Vladislav Vaintroub2009-06-101-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
| | |\ \ \ \ \