summaryrefslogtreecommitdiff
path: root/libmysqld
Commit message (Expand)AuthorAgeFilesLines
* pluggable auth with plugin examplesSergei Golubchik2010-03-294-43/+62
* 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
| | |\ \ \ \ \
| | | * \ \ \ \ 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
| |\ \ \ \ \ \ \ \
View Lorry Controller Status