Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.3 into 10.4 | Marko Mäkelä | 2019-06-19 | 1 | -0/+2 |
|\ | |||||
| * | Fix debug assert to match its intention. | Vladislav Vaintroub | 2019-06-17 | 1 | -1/+1 |
| * | Portability fix. | Vladislav Vaintroub | 2019-06-17 | 1 | -1/+1 |
| * | MDEV-19055 Failures with temporary tables and Aria | Michael Widenius | 2019-06-17 | 1 | -0/+2 |
* | | Merge branch '10.3' into 10.4 | Oleksandr Byelkin | 2019-05-19 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
| |\ | |||||
| | * | Update FSF Address | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
* | | | Merge 10.3 into 10.4mariadb-10.4.0 | Marko Mäkelä | 2018-11-08 | 1 | -7/+19 |
|\ \ \ | |/ / | |||||
| * | | Merge 10.0 into 10.1 | Marko Mäkelä | 2018-11-07 | 1 | -7/+19 |
| |\ \ | |||||
| | * \ | Merge 5.5 into 10.0 | Marko Mäkelä | 2018-11-07 | 1 | -7/+19 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-17401: LOAD DATA from very big file into MyISAM table results in EOF err... | Oleksandr Byelkin | 2018-11-02 | 1 | -7/+19 |
* | | | | mysys: rename ME_xxx flags to match plugin api | Sergei Golubchik | 2018-06-04 | 1 | -3/+3 |
* | | | | mysys: remove dead ME_xxx flags | Sergei Golubchik | 2018-06-04 | 1 | -3/+3 |
|/ / / | |||||
* | | | spelling fixes | klemens | 2017-03-07 | 1 | -2/+2 |
|/ / | |||||
* | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -2/+2 |
|/ | |||||
* | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -13/+21 |
|\ | |||||
| * | Merge 5.2->5.3 | unknown | 2011-09-02 | 1 | -13/+19 |
| |\ | |||||
| | * | Added logging of all errors from my_read/my_write/my_pread/my_pwrite/my_open ... | Michael Widenius | 2011-09-02 | 1 | -12/+18 |
* | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+3 |
|\ \ \ | |||||
| * \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+5 |
| | |\ \ \ | |||||
| | | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
* | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -49/+20 |
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | |||||
| * | | | | Backport Fix for Bug#24509 - 2048 file descriptor limit on windows needs incr... | Vladislav Vaintroub | 2011-06-12 | 1 | -47/+34 |
| | |_|/ | |/| | | |||||
| * | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |||||
| * | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -4/+2 |
| |\ \ \ | |||||
| * | | | | Changed all file names in maria to LEX_STRING and removed some calls to strlen() | Michael Widenius | 2008-08-25 | 1 | -1/+1 |
| * | | | | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * | | | | | compiler warning | unknown | 2008-02-02 | 1 | -1/+4 |
| * | | | | | Fix for Windows-specific bugs: | unknown | 2008-02-02 | 1 | -9/+8 |
| * | | | | | Minor changes. New description in SHOW ENGINES for Maria. | unknown | 2008-01-31 | 1 | -8/+8 |
| * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2008-01-31 | 1 | -2/+3 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fixed bug in restoring auto-increment value in case of duplicate key with ins... | unknown | 2008-01-31 | 1 | -2/+3 |
| * | | | | | | Fix for BUG#34114 "maria_chk reports false error when several tables on | unknown | 2008-01-29 | 1 | -6/+13 |
| |/ / / / / | |||||
| * | | | | | Fixed several bugs in page CRC handling | unknown | 2007-12-18 | 1 | -2/+2 |
| * | | | | | Added error HA_ERR_FILE_TOO_SHORT to be used when files are shorter than expe... | unknown | 2007-12-04 | 1 | -1/+6 |
| * | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 | unknown | 2007-06-27 | 1 | -3/+3 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fixes after review of guilhem of block record patch | unknown | 2007-04-19 | 1 | -2/+0 |
| | * | | | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-maria | unknown | 2007-02-28 | 1 | -3/+6 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Merge with new version | unknown | 2007-01-23 | 1 | -2/+4 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | Implementation of rows-in-block | unknown | 2007-01-18 | 1 | -2/+4 |
| | | * | | | | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean | unknown | 2006-12-20 | 1 | -1/+2 |
| | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean | unknown | 2006-12-18 | 1 | -1/+2 |
| | | | |\ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-maria | unknown | 2006-09-07 | 1 | -1/+2 |
| | | | | |\ \ \ \ \ \ | |||||
| | | | | | * | | | | | | importing Sanja's changes to the control file, with my changes on them. | unknown | 2006-08-29 | 1 | -1/+2 |
| | | | | | |/ / / / / | |||||
* | | | | | | | | | | | Remove configuration preprocessor symbols 'THREAD' | Magne Mahre | 2011-01-11 | 1 | -4/+4 |
* | | | | | | | | | | | WL#2360 Performance schema | Marc Alff | 2009-12-09 | 1 | -5/+5 |
* | | | | | | | | | | | This is the downport of | Vladislav Vaintroub | 2009-09-11 | 1 | -42/+61 |
| |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
* | | | | | | | | | | auto-merge | Ignacio Galarza | 2009-03-17 | 1 | -4/+2 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge BUG#22082 from 5.0-bugteam to 5.1-bugteam | He Zhenxing | 2009-03-06 | 1 | -4/+2 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | | |