summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |\ \ \ \ \
| | | * \ \ \ \ 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
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge XtraDB 6 with latest MariaDB 5.1unknown2009-08-031-2/+2
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge of Percona XtraDB into MariaDB.unknown2009-06-111-2/+2
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | XtraDB after-merge fix: Fix building from storage/xtradb/ instead of storage/...unknown2009-06-091-2/+2
* | | | | | | | | | Added MY_CS_NONASCII marker for character sets that are not compatible with l...Michael Widenius2009-07-021-0/+25
|/ / / / / / / / /
* | | | | | | | | Merged with mysql-5.1 tree.Michael Widenius2009-04-252-4/+4
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Bug #43715 Link errors when trying to link mysql_embedded.exeVladislav Vaintroub2009-03-172-4/+4
* | | | | | | | | bzr merge from guilhem's maria tree to our local 5.1Michael Widenius2009-04-251-0/+9
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-0/+9
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | merging.Alexey Botchkov2009-02-241-0/+9
| | |\ \ \ \ \ \ \
| | | * | | | | | | Bug#39289 libmysqld.a calls exit() upon error Alexey Botchkov2008-10-271-0/+9
| * | | | | | | | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.Guilhem Bichot2009-02-122-2/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
* | | | | | | | | | Added "pool-of-threads" handling (with libevent)Michael Widenius2009-03-131-0/+1
* | | | | | | | | | Merge with base MySQL 5.1Michael Widenius2009-02-152-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 of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my...Guilhem Bichot2008-12-101-0/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merged 5.1 with maria 5.1Michael Widenius2008-10-104-12/+24
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge mysql.com:/home/my/mysql-5.1unknown2008-04-284-6/+21
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/kent/bk/maria/mysql-maria-gcaunknown2008-02-181-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Windows fixesunknown2008-01-101-0/+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
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Bug#34517 SHOW GLOBAL STATUS does not work properly in embedded server.Alexey Botchkov2008-11-171-0/+2
|/ / / / / / / / / / / /