Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-10-04 | 36 | -470/+465 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-10-02 | 36 | -470/+465 |
| |\ | |||||
| | * | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-10-02 | 1 | -35/+24 |
| | |\ | |||||
| | | * | cleanup: reduce code duplication | Sergei Golubchik | 2017-09-27 | 1 | -34/+23 |
| | * | | MDEV-13384 - misc Windows warnings fixed | Vladislav Vaintroub | 2017-09-28 | 13 | -56/+56 |
| | * | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT. | Vladislav Vaintroub | 2017-09-28 | 30 | -382/+388 |
* | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-09-28 | 2 | -5/+6 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-09-28 | 2 | -5/+6 |
| |\ \ \ | | |/ / | |||||
| | * | | Added missing test if table is transactional or not in Aria | Monty | 2017-09-28 | 1 | -0/+1 |
| | * | | Fixed compiler warning | Monty | 2017-09-27 | 1 | -5/+5 |
* | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-09-25 | 2 | -9/+34 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.2 into bb-10.2-ext | Marko Mäkelä | 2017-09-25 | 1 | -8/+33 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-09-25 | 1 | -8/+33 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-11846: ERROR 1114 (HY000) table full when performing GROUP BY | Varun Gupta | 2017-09-24 | 1 | -8/+33 |
| * | | | Merge branch '10.2' into bb-10.2-ext | Sergei Golubchik | 2017-09-23 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Fix that FLUSH TABLES FOR EXPORT also works for Aria tables. | Monty | 2017-09-21 | 1 | -1/+1 |
* | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-09-01 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.2 into bb-10.2-ext | Marko Mäkelä | 2017-09-01 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Add ATTRIBUTE_NORETURN and ATTRIBUTE_COLD | Marko Mäkelä | 2017-08-31 | 1 | -1/+1 |
* | | | | Merge branch 'bb-10.2-ext' into 10.3 | Sergei Golubchik | 2017-08-26 | 3 | -4/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.2' into bb-10.2-ext | Sergei Golubchik | 2017-08-25 | 3 | -4/+5 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-08-17 | 3 | -4/+5 |
| | |\ \ | | | |/ | |||||
| | | * | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-08-08 | 3 | -4/+5 |
| | | |\ | |||||
| | | | * | Merge remote-tracking branch 'origin/5.5' into 10.0 | Vicențiu Ciorbaru | 2017-07-25 | 2 | -4/+4 |
| | | | |\ | |||||
| | | | | * | ma_check/mi_check: maria_repair_parallel initialization for !quick | Daniel Black | 2017-07-18 | 1 | -1/+3 |
| | | | | * | change flags as it was done in MyISAM | Sergei Golubchik | 2017-07-15 | 1 | -3/+1 |
| | | | | * | ma_recovery: unintentional order of operations | Daniel Black | 2017-07-15 | 1 | -1/+1 |
| | | | * | | MDEV-12824 GCC 7 warning: this statement may fall through [-Wimplicit-fallthr... | Sergei Golubchik | 2017-07-20 | 1 | -0/+1 |
* | | | | | | Remove dumping of some not needed core's when running test suite | Michael Widenius | 2017-08-24 | 5 | -8/+8 |
* | | | | | | Added DBUG_ASSERT_AS_PRINTF compile flag | Monty | 2017-08-24 | 8 | -16/+14 |
* | | | | | | Enusure that my_global.h is included first | Michael Widenius | 2017-08-24 | 4 | -3/+2 |
* | | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3MDEV-9804 | Alexander Barkov | 2017-07-13 | 2 | -1/+4 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-07-12 | 2 | -1/+4 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-07-08 | 2 | -1/+4 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-07-07 | 2 | -1/+4 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-07-06 | 2 | -1/+4 |
| | | | |\ \ | | | | | |/ | |||||
| | | | | * | ma_pagecache: release lock in pagecache_read | Daniel Black | 2017-07-03 | 1 | -0/+1 |
| | | | | * | ma_loghandler: translog_set_only_in_buffers failed to release lock | Daniel Black | 2017-07-03 | 1 | -1/+2 |
| | | | | * | ma_loghandler: release file_header_lock on error | Daniel Black | 2017-07-03 | 1 | -0/+1 |
* | | | | | | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-07-05 | 7 | -15/+30 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-07-04 | 7 | -15/+30 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Fixed compilation warnings (while testing 32 bit builds) | Monty | 2017-07-01 | 1 | -2/+2 |
| | * | | | | Added tmp_disk_table_size to limit size of Aria temp tables in tmpdir | Monty | 2017-06-30 | 5 | -11/+28 |
| | * | | | | Simplify IO_CACHE by removing current_pos and end_pos as self-references | Vicențiu Ciorbaru | 2017-06-28 | 1 | -2/+0 |
* | | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-06-19 | 7 | -33/+58 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-06-15 | 7 | -33/+58 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Fix some printf format type mismatch | Marko Mäkelä | 2017-06-06 | 1 | -8/+8 |
| | * | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-23 | 4 | -22/+37 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-05-23 | 4 | -22/+37 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Merge branch '5.5' into 10.0mariadb-10.0.31 | Sergei Golubchik | 2017-05-20 | 1 | -8/+17 |
| | | | |\ \ | | | | | |/ |