Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.2 into 10.3 | Marko Mäkelä | 2019-05-14 | 1 | -1/+1 |
|\ | |||||
| * | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-13 | 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 |
* | | | | Change read_to_buffer to use ulong instead of uint | Michael Widenius | 2018-05-07 | 1 | -5/+5 |
* | | | | Add likely/unlikely to speed up execution | Monty | 2018-05-07 | 1 | -3/+3 |
* | | | | Merge 10.2 into 10.3 | Marko Mäkelä | 2018-04-24 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Remove most 'register' use in C++ | Marko Mäkelä | 2018-04-24 | 1 | -1/+1 |
* | | | | MDEV-15091 : Windows, 64bit: reenable and fix warning C4267 (conversion from ... | Vladislav Vaintroub | 2018-02-06 | 1 | -4/+4 |
* | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-10-04 | 1 | -3/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | fix some conversion warnings | Vladislav Vaintroub | 2017-09-28 | 1 | -3/+3 |
* | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-09-21 | 1 | -6/+10 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.1' into 10.2 | Vicențiu Ciorbaru | 2017-09-19 | 1 | -6/+10 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2017-09-19 | 1 | -6/+10 |
| | |\ \ | |||||
| | | * | | Fix merge error | Vicențiu Ciorbaru | 2017-09-19 | 1 | -2/+2 |
| | | * | | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2017-09-19 | 1 | -6/+10 |
| | | |\ \ | | | | |/ | |||||
| | | | * | MDEV-13458: Wrong result for aggregate function with distinct clause when the... | Varun Gupta | 2017-08-09 | 1 | -4/+8 |
* | | | | | Merge branch 'bb-10.2-ext' into 10.3 | Sergei Golubchik | 2017-08-26 | 1 | -6/+10 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-08-17 | 1 | -6/+10 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-08-08 | 1 | -6/+10 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge remote-tracking branch 'origin/5.5' into 10.0 | Vicențiu Ciorbaru | 2017-07-25 | 1 | -6/+10 |
| | | |\ \ | | | | |/ | |||||
| | | | * | MDEV-12136 SELECT COUNT(DISTINCT) returns the wrong value when tmp_table_size... | Sergei Golubchik | 2017-07-13 | 1 | -2/+6 |
| | | | * | MDEV-12136 SELECT COUNT(DISTINCT) returns the wrong value when tmp_table_size... | Sergei Golubchik | 2017-07-12 | 1 | -3/+3 |
* | | | | | Enusure that my_global.h is included first | Michael Widenius | 2017-08-24 | 1 | -1/+1 |
* | | | | | Fix that end_bulk_insert() doesn't write to to-be-deleted files | Monty | 2017-05-17 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Removed TABLE->sort to make it possible to have multiple active calls to | Monty | 2016-03-22 | 1 | -32/+38 |
|/ / / | |||||
* | | | misc IO_CACHE cleanups | Sergei Golubchik | 2015-06-02 | 1 | -2/+1 |
|/ / | |||||
* | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-05-04 | 1 | -7/+7 |
|\ \ | |/ | |||||
| * | Fix failing test cases for MDEV-7912 patch | Vicentiu Ciorbaru | 2015-04-29 | 1 | -4/+0 |
| * | MDEV-7912 multitable delete with wrongly set sort_buffer_size crashes in merg... | Vicentiu Ciorbaru | 2015-04-28 | 1 | -6/+9 |
* | | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -0/+1 |
* | | MDEV-5314 - Compiling fails on OSX using clang | Sergey Vojtovich | 2014-02-19 | 1 | -1/+1 |
* | | Fixed bug mdev-4369. | Igor Babaev | 2013-04-06 | 1 | -4/+36 |
* | | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -57/+100 |
|\ \ | |/ | |||||
| * | Merge 5.3->5.5 | Igor Babaev | 2013-01-23 | 1 | -57/+96 |
| |\ | |||||
| | * | Merge 5.2->5.3 | Igor Babaev | 2013-01-21 | 1 | -55/+96 |
| | |\ | |||||
| | | * | Fixed bug mdev-4063 (bug #56927). | Igor Babaev | 2013-01-21 | 1 | -51/+93 |
| | * | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+5 |
| | |\ \ | | | |/ | |||||
| | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+5 |
| | | |\ | |||||
| * | | \ | mysql-5.5.29 merge | Sergei Golubchik | 2013-01-15 | 1 | -1/+6 |
| |\ \ \ \ | |||||
| | * | | | | Bug#14542543 FIX BUG #12694872 IN 5.5 | Tor Didriksen | 2012-09-18 | 1 | -1/+6 |
* | | | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -7/+10 |
* | | | | | | MDEV-415: Back-port of the WL task #1393 from the mysql-5.6 code line. | Igor Babaev | 2012-09-01 | 1 | -4/+5 |
|/ / / / / | |||||
* | | | | | 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/+5 |
| | |\ \ \ | |||||
| | | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
* | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -27/+79 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Fixed DBUG_PRINT formatting (compile error on Linux with -Werror) | Vladislav Vaintroub | 2011-02-19 | 1 | -3/+4 |
| * | | | | | Fix numerous warnings introduced in the last pushes on Windows | Vladislav Vaintroub | 2011-02-18 | 1 | -4/+4 |