Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -8/+10 |
|\ | |||||
| * | Fix test errors like: | Sergey Petrunya | 2013-07-08 | 1 | -2/+4 |
| * | Fixed some merge issues: | Michael Widenius | 2013-06-18 | 1 | -1/+2 |
| * | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -7/+8 |
* | | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -1/+1 |
|\ \ | |||||
| * \ | mysql-5.5.32 merge | Sergei Golubchik | 2013-07-16 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER | Murthy Narkedimilli | 2013-03-19 | 1 | -1/+1 |
* | | | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -4/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 1 | -4/+6 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#16385711: HANDLER, CREATE TABLE IF NOT EXISTS, | Jon Olav Hauglid | 2013-02-28 | 1 | -5/+10 |
* | | | | error messages: name the storage engine explicitly, | Sergei Golubchik | 2013-04-09 | 1 | -2/+4 |
| |_|/ |/| | | |||||
* | | | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -14/+15 |
|\ \ \ | |/ / | |||||
| * | | mysql-5.5.29 merge | Sergei Golubchik | 2013-01-15 | 1 | -14/+15 |
| |\ \ | | |/ | |||||
| | * | Bug #14036214 MYSQLD CRASHES WHEN EXECUTING UPDATE IN TRX WITH | Annamalai Gurusami | 2012-10-08 | 1 | -12/+13 |
* | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -1/+1 |
|/ / | |||||
* | | Merge mariadb 5.3->mariadb 5.5 | unknown | 2012-03-24 | 1 | -1/+2 |
|\ \ | |||||
| * | | Speedup: | Michael Widenius | 2012-03-23 | 1 | -1/+2 |
* | | | 5.3 merge | Sergei Golubchik | 2012-02-24 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Fixed lp:933719, "Assertion open_tables == 0 ... " in THD::restore_backup_ope... | Michael Widenius | 2012-02-23 | 1 | -1/+1 |
| * | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+4 |
| |\ \ | |||||
| | * \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+4 |
| | |\ \ | |||||
| | | * \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+4 |
| | | |\ \ | |||||
* | | | \ \ | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -1/+1 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | |\ \ \ \ | |||||
| | | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
* | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -291/+476 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Fix formatting error message (invalid table name) in handler tests. | Vladislav Vaintroub | 2011-03-29 | 1 | -1/+1 |
| * | | | | | | Fix for LP#702786 "Two handler read f1 next gives different errors" | Michael Widenius | 2011-01-14 | 1 | -0/+1 |
| * | | | | | | Added HANDLER support for MEMORY tables | Michael Widenius | 2011-01-11 | 1 | -2/+2 |
| * | | | | | | Merge with 5.1 | Michael Widenius | 2011-01-11 | 1 | -3/+21 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Automatic merge with 5.1 | Michael Widenius | 2011-01-10 | 1 | -3/+16 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | * | | | | - Fixed that Aria works with HANDLER commands | Michael Widenius | 2011-01-10 | 1 | -2/+15 |
| | | | |/ / | | | |/| | | |||||
| * | | | | | Implementation of MWL#172: Add support for prepared statements to HANDLER READ | Michael Widenius | 2011-01-04 | 1 | -227/+376 |
| |/ / / / | |||||
* | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -19/+21 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Fix for BUG#59894 | Guilhem Bichot | 2011-02-11 | 1 | -2/+3 |
| * | | | | Patch that refactors global read lock implementation and fixes | Dmitry Lenev | 2010-11-11 | 1 | -17/+18 |
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -9/+11 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -3/+20 |
| |\ \ \ | | |/ / | |||||
| * | | | Fixed bug #604503. | Igor Babaev | 2010-07-17 | 1 | -1/+1 |
| * | | | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -5/+2 |
| |\ \ \ | |||||
| * \ \ \ | Merge of the patch introducing virtual columns into maria-5.2 | Igor Babaev | 2009-11-11 | 1 | -0/+2 |
| |\ \ \ \ | |||||
| | * | | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns. | Igor Babaev | 2009-10-16 | 1 | -0/+2 |
| * | | | | | This is based on the userstatv2 patch from Percona and OurDelta. | Michael Widenius | 2009-10-19 | 1 | -9/+9 |
| |/ / / / | |||||
* | | | | | Commit on behalf of Dmitry Lenev. | Konstantin Osipov | 2010-08-12 | 1 | -1/+1 |
* | | | | | A pre-requisite patch for the fix for Bug#52044. | Konstantin Osipov | 2010-07-27 | 1 | -2/+19 |
* | | | | | merge from mysql-trunk-bugfixing | Jon Olav Hauglid | 2010-07-13 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled | Davi Arnaut | 2010-07-08 | 1 | -2/+2 |
* | | | | | | Bug #54401 assert in Diagnostics_area::set_eof_status , HANDLER | Jon Olav Hauglid | 2010-07-05 | 1 | -0/+4 |
|/ / / / / | |||||
* | | | | | Merge trunk-bugfixing -> trunk-runtime | Konstantin Osipov | 2010-06-17 | 1 | -3/+20 |
|\ \ \ \ \ |