Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.2' into bb-10.2-mdev9543 | Sergei Petrunia | 2016-03-28 | 1 | -29/+30 |
|\ | |||||
| * | Removed TABLE->sort to make it possible to have multiple active calls to | Monty | 2016-03-22 | 1 | -29/+30 |
* | | Remove all comments starting with 'psergey' | Sergei Petrunia | 2016-03-02 | 1 | -1/+1 |
* | | MDEV-9526: Compute Aggregate functions as window functions | Sergei Petrunia | 2016-02-18 | 1 | -3/+3 |
* | | This is the consolidated patch for mdev-8646:bb-10.2-mdev8646 | Igor Babaev | 2016-02-09 | 1 | -1/+1 |
|/ | |||||
* | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-11-19 | 1 | -1/+4 |
|\ | |||||
| * | Fixed MDEV-8408 | Monty | 2015-10-23 | 1 | -1/+4 |
* | | Merge branch '10.0' into bb-10.1-merge | Sergei Golubchik | 2014-12-02 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -0/+1 |
* | | Merge 10.0.14 into 10.1 | Sergei Golubchik | 2014-10-15 | 1 | -2/+1 |
|\ \ | |/ | |||||
| * | MDEV-6312 HA_MUST_USE_TABLE_CONDITION_PUSHDOWN is not accounted by init_read_... | Sergei Golubchik | 2014-07-31 | 1 | -3/+1 |
* | | prefer to use new flag name when possible | Sergei Golubchik | 2014-10-10 | 1 | -1/+1 |
* | | MDEV-6513 deprecate engine_condition_pushdown value of the @@optimizer_switch | Sergei Golubchik | 2014-10-10 | 1 | -2/+2 |
|/ | |||||
* | 5.5 merge | Sergei Golubchik | 2014-02-01 | 1 | -1/+2 |
|\ | |||||
| * | Fix for MDEV-5531: double call procedure in one session - hard shutdown the s... | Michael Widenius | 2014-01-24 | 1 | -1/+2 |
* | | 5.5 merge and fixes for compiler/test errors | Sergei Golubchik | 2013-09-18 | 1 | -1/+9 |
|\ \ | |/ | |||||
| * | tokudb patches for prepare range scan | Sergei Golubchik | 2013-09-09 | 1 | -1/+9 |
* | | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -2/+8 |
|\ \ | |/ | |||||
| * | mysql-5.5.29 merge | Sergei Golubchik | 2013-01-15 | 1 | -2/+8 |
| |\ | |||||
| | * | Bug #14036214 MYSQLD CRASHES WHEN EXECUTING UPDATE IN TRX WITH | Annamalai Gurusami | 2012-10-08 | 1 | -2/+8 |
| | * | merge 5.1 => 5.5 | Tor Didriksen | 2012-06-05 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Bug#14051002 VALGRIND: CONDITIONAL JUMP OR MOVE IN RR_CMP / MY_QSORT | Tor Didriksen | 2012-06-05 | 1 | -1/+1 |
* | | | | 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/+1 |
|\ \ \ | |||||
| * | | | Speedup: | Michael Widenius | 2012-03-23 | 1 | -1/+1 |
| * | | | Backport some simple performance patches from 5.5. | unknown | 2012-03-22 | 1 | -1/+2 |
* | | | | Few simple performance fixes found with sysbench oltp.lua and Oprofile: | unknown | 2012-03-21 | 1 | -1/+2 |
* | | | | Merge 5.3->5.5 | Igor Babaev | 2012-03-17 | 1 | -2/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed bug lp:917689 "Archive table corruption crashing MariaDB signal 11" | Michael Widenius | 2012-03-13 | 1 | -2/+4 |
* | | | | 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 | -3/+5 |
| | |\ \ \ | |||||
| | | * \ \ | 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 | -13/+11 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | 5.2->5.3 merge | Sergei Golubchik | 2011-11-12 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | 5.1 merge | Sergei Golubchik | 2011-11-12 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| / / / | | | |/ / / | |||||
| | | * | | | typos fixed | Sergei Golubchik | 2011-11-08 | 1 | -1/+1 |
| * | | | | | BUG#882472: subselect4.test fails in current 5.3 | Sergey Petrunya | 2011-10-27 | 1 | -10/+8 |
* | | | | | | 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 | -10/+2 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Merge from 5.2 | unknown | 2011-07-21 | 1 | -9/+0 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Merge 5.1->5.2 | unknown | 2011-07-21 | 1 | -9/+0 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | * | | | | Removed incorrect fix and its test suite (the test suit is duplicate). | unknown | 2011-07-21 | 1 | -9/+0 |
| * | | | | | | Merged the code of MWL#106 into 5.3 | Igor Babaev | 2011-05-16 | 1 | -1/+2 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | MWL#106: Backport optimizations for derived tables and views. | Igor Babaev | 2010-05-26 | 1 | -1/+2 |
| * | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -0/+9 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -0/+9 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | |