Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Simplify IO_CACHE by removing current_pos and end_pos as self-references | Vicențiu Ciorbaru | 2017-06-28 | 1 | -38/+1 |
* | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 1 | -5/+8 |
|\ | |||||
| * | spelling fixes | klemens | 2017-03-07 | 1 | -4/+4 |
| * | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-03 | 1 | -1/+4 |
| |\ | |||||
| | * | MDEV-9573 'Stop slave' hangs on replication slave | Monty | 2017-02-28 | 1 | -1/+4 |
* | | | MDEV-10092: Server crashes in in ha_heap::rnd_pos / Table_read_cursor::get_next | Vicențiu Ciorbaru | 2017-02-15 | 1 | -4/+11 |
* | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-12-29 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | MDEV-10508 Mariadb crash on out of disk space during dump import | Sergei Golubchik | 2016-09-28 | 1 | -2/+2 |
* | | | MDEV-9736: Window functions: multiple cursors to read filesort result | Sergei Petrunia | 2016-09-24 | 1 | -14/+134 |
* | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-06-30 | 1 | -0/+4 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-06-28 | 1 | -0/+4 |
| |\ \ | | |/ | |||||
| | * | Merge branch '5.5' into bb-10.0 | Sergei Golubchik | 2016-06-21 | 1 | -0/+1 |
| | |\ | |||||
| | | * | MDEV-9433: [PATCH} cppcheck reported a number of minor coding errors | Daniel Black | 2016-06-14 | 1 | -0/+1 |
| | * | | MDEV-10001 my_b_seek() may not work correctly after my_b_read() hits EOF | Sergei Golubchik | 2016-06-15 | 1 | -0/+3 |
* | | | | Fixed compiler warnings and test failures found by buildbot | Monty | 2016-06-24 | 1 | -2/+2 |
|/ / / | |||||
* | | | MDEV-9044 : Binlog corruption in Galera | Nirbhay Choubey | 2015-12-18 | 1 | -1/+5 |
* | | | New encryption API. Piece-wise encryption. | Sergei Golubchik | 2015-09-04 | 1 | -1/+1 |
* | | | my_aes_get_size() | Sergei Golubchik | 2015-06-02 | 1 | -1/+1 |
* | | | MDEV-8126 encryption for temp files | Sergei Golubchik | 2015-06-02 | 1 | -4/+55 |
* | | | misc IO_CACHE cleanups | Sergei Golubchik | 2015-06-02 | 1 | -170/+182 |
* | | | cleanup: LOAD DATA replication support in IO_CACHE | Sergei Golubchik | 2015-06-02 | 1 | -13/+1 |
|/ / | |||||
* | | Merge MDEV-5657 (parallel replication) to 10.0 | unknown | 2014-02-26 | 1 | -4/+0 |
|\ \ | |||||
| * | | MDEV-5657: Parallel replication. | unknown | 2014-02-26 | 1 | -4/+0 |
| |/ | |||||
* | | MDEV-5314 - Compiling fails on OSX using clang | Sergey Vojtovich | 2014-02-19 | 1 | -1/+1 |
* | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -4/+4 |
|/ | |||||
* | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 1 | -1/+6 |
|\ | |||||
| * | Follow up patch for BUG#13961678. Fixing compilation warning given below. | Sujatha Sivakumar | 2012-07-25 | 1 | -1/+1 |
| * | Bug#13961678:MULTI-STATEMENT TRANSACTION REQUIRED MORE THAN | Sujatha Sivakumar | 2012-07-24 | 1 | -1/+6 |
* | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+2 |
|\ \ | |||||
| * \ | 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 |
| | | |\ \ | |||||
* | | | \ \ | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -6/+4 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge with 5.2 | Michael Widenius | 2011-09-10 | 1 | -5/+3 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Fixed that automatic killing of delayed insert thread (in flush, alter table ... | Michael Widenius | 2011-09-09 | 1 | -5/+3 |
| * | | | | | Merge 5.2->5.3 | unknown | 2011-09-02 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Fixed non critical buffer overflow bug in open_binary_frm() that could cause ... | Michael Widenius | 2011-09-01 | 1 | -1/+1 |
| | |/ / / | |||||
* | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+2 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | 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 | -3/+0 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Backport Fix for Bug#24509 - 2048 file descriptor limit on windows needs incr... | Vladislav Vaintroub | 2011-06-12 | 1 | -3/+0 |
| | |_|_|/ | |/| | | | |||||
* | | | | | post-merge fixes. | Sergei Golubchik | 2011-07-02 | 1 | -2/+0 |
* | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -61/+26 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Remove configuration preprocessor symbols 'THREAD' | Magne Mahre | 2011-01-11 | 1 | -37/+2 |
| * | | | | Bug#58052 Binary log IO not being accounted for properly | Marc Alff | 2010-11-12 | 1 | -24/+24 |
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -4/+7 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -4/+7 |
| |\ \ \ | | |/ / | |||||
| * | | | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -4/+10 |
| |\ \ \ |