summaryrefslogtreecommitdiff
path: root/sql/event_data_objects.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.0' into bb-10.1-mergeSergei Golubchik2014-12-021-1/+1
|\
| * MDEV-5120 Test suite test maria-no-logging failsMichael Widenius2014-09-301-1/+1
* | cleanup: galera merge, simple changesSergei Golubchik2014-10-011-9/+1
* | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-261-0/+17
|/
* 10.0-base mergeSergei Golubchik2013-11-131-1/+1
|\
| * 5.5. mergeSergei Golubchik2013-11-131-1/+1
| |\
| | * MDEV-4824 userstats - wrong user statisticsSergei Golubchik2013-11-111-1/+1
* | | Applied all changes from Igor and SanjaMichael Widenius2013-06-151-1/+1
* | | 10.0-base mergeSergei Golubchik2013-01-311-1/+1
|\ \ \ | |/ /
| * | cleanup: use MYF() for mysys flagsSergei Golubchik2013-01-231-1/+1
| * | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-1/+1
| |/
* | more fixes for test casesSergei Golubchik2012-10-011-2/+4
* | Added support of thd->tx_read_onlyMichael Widenius2012-08-071-0/+4
|/
* 5.3 mergeSergei Golubchik2012-01-131-1/+2
|\
| * Merge with 5.2.Michael Widenius2011-12-111-2/+4
| |\
| | * Merge with MariaDB 5.1Michael Widenius2011-11-241-2/+4
| | |\
| | | * Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-2/+4
| | | |\
* | | | \ mysql-5.5.18 mergeSergei Golubchik2011-11-031-2/+2
|\ \ \ \ \
| * \ \ \ \ Updated/added copyright headersKent Boortz2011-06-301-2/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Updated/added copyright headersKent Boortz2011-06-301-2/+4
* | | | | | merge with 5.3Sergei Golubchik2011-10-191-5/+5
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | merge with 5.1-microSergei Golubchik2011-06-071-2/+2
| |\ \ \ \ \
| | * | | | | revert a suggested "optimization" that introduced a bugSergei Golubchik2011-06-061-2/+2
| * | | | | | Merge with 5.1-microsecondsMichael Widenius2011-05-281-3/+3
| |\ \ \ \ \ \ | | |/ / / / / | | | | | / / | | |_|_|/ / | |/| | | |
| | * | | | wl#173 - temporal types with sub-second resolutionSergei Golubchik2011-03-011-3/+3
| | | |/ / | | |/| |
* | | | | 5.5-mergeSergei Golubchik2011-07-021-46/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge from mysql-5.5-runtime to mysql-5.5-bugteamJon Olav Hauglid2010-11-181-45/+0
| |\ \ \ \
| | * | | | Patch that refactors global read lock implementation and fixesDmitry Lenev2010-11-111-45/+0
| * | | | | Bug#57306 SHOW PROCESSLIST does not display string literals well.Alexander Barkov2010-11-181-1/+1
| |/ / / /
* | | | | merge.Sergei Golubchik2010-11-251-4/+2
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge with MariaDB 5.1.49Michael Widenius2010-08-051-3/+7
| |\ \ \ | | | |/ | | |/|
| | * | Merge with MySQL 5.1.49Michael Widenius2010-08-021-3/+7
| | |\ \ | | | |/
| | | * Manual merge from the bugfix tree.Alexey Kopytov2010-06-111-1/+4
| | | |\
| * | | \ mergedSergei Golubchik2010-03-151-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-1/+1
| | |\ \ \
| * | \ \ \ merge 5.1-> 5.2unknown2009-12-081-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge with MySQL 5.1, with following additions:unknown2009-11-161-1/+1
| | |\ \ \ \
| * | | | | | This is based on the userstatv2 patch from Percona and OurDelta.Michael Widenius2009-10-191-1/+1
| |/ / / / /
| * | | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-mergeSergey Petrunya2009-09-151-2/+1
| |\ \ \ \ \
| | * | | | | Updated documentation files to reflect MariaDB and not the Maria storage engi...Michael Widenius2009-09-031-2/+1
| * | | | | | Merge MySQL->MariaDBSergey Petrunya2009-09-081-16/+4
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merged with mysql-5.1 tree.Michael Widenius2009-04-251-2/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merged 5.1 with maria 5.1Michael Widenius2008-10-101-541/+22
| |\ \ \ \ \ \ \
| * | | | | | | | Fixed compiler warnings in a lot of filesunknown2008-02-131-1/+0
* | | | | | | | | A pre-requisite patch for the fix for Bug#52044.Konstantin Osipov2010-07-271-13/+5
* | | | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabledDavi Arnaut2010-07-081-3/+3
* | | | | | | | | Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-06-111-1/+4
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Manual merge from the bugfix tree.Alexey Kopytov2010-06-111-1/+4
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | |
| | * | | | | | | Bug #42064: low memory crash when importing hex strings, inAlexey Kopytov2010-05-211-1/+4
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Backport from next-mr-bugfixing of tor.didriksen@sun.com-20100106140051-3j2iu...Tor Didriksen2010-05-191-2/+3
| |/ / / / / /
View Lorry Controller Status