Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| * | | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2017-12-20 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | MDEV-13655: Set role does not properly grant privileges. | Vicențiu Ciorbaru | 2017-12-19 | 1 | -1/+1 |
* | | | | Backporting MDEV-15597 Add class Load_data_outvar and avoid using Item::STRIN... | Alexander Barkov | 2019-02-23 | 1 | -0/+36 |
* | | | | Fix many -Wconversion warnings. | Marko Mäkelä | 2017-03-07 | 1 | -18/+19 |
* | | | | MDEV-11170: MariaDB 10.2 cannot start on MySQL 5.7 datadir | Vicențiu Ciorbaru | 2017-02-14 | 1 | -1/+1 |
* | | | | cleanup: fix a comment | Sergei Golubchik | 2016-12-12 | 1 | -6/+7 |
* | | | | Merge branch '10.1' into 10.2 | Monty | 2016-02-06 | 1 | -1/+8 |
|\ \ \ \ | |/ / / | |||||
| * | | | cleanup: LEX_USER::pwtext and LEX_USER::pwhash | Sergei Golubchik | 2016-01-25 | 1 | -3/+4 |
| * | | | cleanup: create LEX_USER::reset_auth() | Sergei Golubchik | 2016-01-25 | 1 | -0/+6 |
* | | | | MDEV-9170 Get rid of LEX::length and LEX::dec | Alexander Barkov | 2015-11-23 | 1 | -0/+70 |
|/ / / | |||||
* | | | A preparatory patch for MDEV-7284 INDEX: CREATE OR REPLACE. | Alexander Barkov | 2015-03-20 | 1 | -1/+4 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-03-07 | 1 | -0/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-03-06 | 1 | -0/+1 |
| |\ \ | | |/ | |||||
| | * | MDEV-6838: Using too big key for internal temp tables | Vicențiu Ciorbaru | 2015-02-28 | 1 | -0/+1 |
* | | | MDEV-7112 Split HA_CREATE_INFO | Alexander Barkov | 2014-12-08 | 1 | -0/+75 |
* | | | MDEV-6108 update userstat feature from percona server | Sergei Golubchik | 2014-10-11 | 1 | -37/+1 |
* | | | cleanup: sort struct members by size | Sergei Golubchik | 2014-10-11 | 1 | -4/+4 |
* | | | cleanup: remove dead code | Sergei Golubchik | 2014-10-11 | 1 | -27/+0 |
* | | | MDEV 4427: query timeouts | Monty | 2014-10-07 | 1 | -2/+7 |
* | | | Better comments about KEY::ext_key_part_map | Sergei Petrunia | 2014-09-25 | 1 | -1/+13 |
|/ / | |||||
* | | 10.0-base merge (roles) | Sergei Golubchik | 2013-10-29 | 1 | -0/+8 |
|\ \ | |||||
| * | | support DEFINER=role and DEFINER=current_role | Sergei Golubchik | 2013-10-18 | 1 | -0/+8 |
* | | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -4/+4 |
|/ / | |||||
* | | Addressed all remaining issues from the review of the patch | Igor Babaev | 2012-12-13 | 1 | -1/+1 |
* | | Performed re-factoring and re-structuring of the code for mwl#248: | Igor Babaev | 2012-07-26 | 1 | -36/+5 |
* | | Changed the type of all double columns in the system statistical tables | Igor Babaev | 2012-06-25 | 1 | -5/+18 |
* | | The pilot implementation of mwl#250: Use the statistics from persistent | Igor Babaev | 2012-04-11 | 1 | -0/+14 |
* | | Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248. | Igor Babaev | 2012-03-19 | 1 | -0/+25 |
|\ \ | |/ |/| | |||||
| * | The main patch for the MWL#248 back-ported from | Igor Babaev | 2012-01-04 | 1 | -0/+25 |
* | | Merge MWL #247 from mariadb 5.3 -> mariadb 5.5. | Igor Babaev | 2012-03-02 | 1 | -0/+3 |
|\ \ | |||||
| * \ | Merged MWL#247 into the latest 5.3. | Igor Babaev | 2011-12-31 | 1 | -0/+3 |
| |\ \ | | |/ | |/| | |||||
| | * | Implementation of the MWL#247: Make the optimizer use extended keys. | Igor Babaev | 2011-12-31 | 1 | -0/+3 |
| * | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+5 |
| |\ \ | |||||
| | * \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+5 |
| | |\ \ | |||||
* | | \ \ | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -3/+6 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | BUG#882472: subselect4.test fails in current 5.3 | Sergey Petrunya | 2011-10-27 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
| * | | | Allow one to block an account by using GRANT max_user_connections = -1 | Michael Widenius | 2011-09-26 | 1 | -3/+6 |
* | | | | 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 |
| * | | | | | WL#1054: Pluggable authentication support | Georgi Kodinov | 2010-08-09 | 1 | -1/+1 |
* | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -2/+2 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge with 5.2 | Michael Widenius | 2011-05-16 | 1 | -1/+2 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | small enhancement of the create table options feature: | Sergei Golubchik | 2011-05-10 | 1 | -1/+2 |
| * | | | | | Backport of: | Sergey Petrunya | 2011-01-14 | 1 | -1/+0 |
* | | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -0/+1 |