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 |
| | * | MDEV-13459 Warnings, when compiling with gcc-7.x | Sergei Golubchik | 2017-10-17 | 1 | -0/+1 |
* | | | Windows : Fix truncation warnings in sql/ | Vladislav Vaintroub | 2017-10-10 | 1 | -2/+2 |
* | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-23 | 1 | -0/+9 |
|\ \ \ | |/ / | |||||
| * | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-05-20 | 1 | -0/+9 |
| |\ \ | |||||
| | * \ | Merge remote-tracking branch 'origin/10.0' into 10.0 | Vicențiu Ciorbaru | 2017-05-18 | 1 | -1/+2 |
| | |\ \ | |||||
| | | * | | Silence bogus GCC 7 warnings -Wimplicit-fallthrough | Marko Mäkelä | 2017-05-17 | 1 | -1/+2 |
| | * | | | Merge remote-tracking branch 'origin/5.5' into 10.0 | Vicențiu Ciorbaru | 2017-05-17 | 1 | -0/+9 |
| | |\ \ \ | | | |/ / | | |/| / | | | |/ | |||||
| | | * | Fixed the bug mdev-7599. | Igor Babaev | 2017-05-15 | 1 | -0/+9 |
* | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-22 | 1 | -1/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Silence bogus GCC 7 warnings -Wimplicit-fallthrough | Marko Mäkelä | 2017-05-17 | 1 | -1/+2 |
* | | | | Fixed the bug mdev-11990. | Igor Babaev | 2017-05-03 | 1 | -1/+1 |
* | | | | cleanup: handler::key_read | Sergei Golubchik | 2017-02-13 | 1 | -1/+1 |
* | | | | MDEV-11836 vcol.vcol_keys_myisam fails in buildbot and outside | Sergei Golubchik | 2017-02-13 | 1 | -2/+2 |
* | | | | This is the consolidated patch for mdev-8646:bb-10.2-mdev8646 | Igor Babaev | 2016-02-09 | 1 | -2/+2 |
|/ / / | |||||
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-11-19 | 1 | -2/+4 |
|\ \ \ | |/ / | |||||
| * | | MDEV-7930 Assertion `table_share->tmp_table != NO_TMP_TABLE || m_lock_type !=... | Oleksandr Byelkin | 2015-10-28 | 1 | -2/+4 |
* | | | MDEV-7949: Item_field::used_tables() takes 0.29% in OLTP RO | Oleksandr Byelkin | 2015-10-29 | 1 | -3/+4 |
* | | | Fixed bug found by bar where we didn't properely check length of last argumen... | Monty | 2015-07-10 | 1 | -1/+1 |
|/ / | |||||
* | | 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 | -7/+7 |
* | | 10.0-base merge | Sergei Golubchik | 2013-11-13 | 1 | -3/+21 |
|\ \ | |/ | |||||
| * | MDEV-5257: MIN/MAX Optimization (Select tables optimized away) does not work ... | Sergey Petrunya | 2013-11-12 | 1 | -3/+21 |
* | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -1/+1 |
|\ \ | |/ |/| | |||||
| * | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -1/+1 |
* | | MDEV-4243 Warnings/errors while compiling with clang | Sergei Golubchik | 2013-03-28 | 1 | -1/+1 |
|/ | |||||
* | MDEV-414 Depending on indexes or execution plans, a warning on incorrect or o... | Sergei Golubchik | 2012-08-31 | 1 | -1/+1 |
* | 5.3 merge | Sergei Golubchik | 2012-05-21 | 1 | -1/+3 |
|\ | |||||
| * | Merge 5.2->5.3 | unknown | 2012-05-11 | 1 | -1/+3 |
| |\ | |||||
| | * | Fix for LP bug#993726 | unknown | 2012-05-07 | 1 | -1/+3 |
* | | | Merge 5.3->5.5 | Igor Babaev | 2012-03-17 | 1 | -2/+8 |
|\ \ \ | |/ / | |||||
| * | | Merge 5.2->5.3 | unknown | 2012-03-14 | 1 | -2/+8 |
| |\ \ | | |/ | |||||
| | * | Fixed LP bug #884175. | Igor Babaev | 2012-03-08 | 1 | -2/+8 |
* | | | Merge MWL #247 from mariadb 5.3 -> mariadb 5.5. | Igor Babaev | 2012-03-02 | 1 | -2/+2 |
|\ \ \ | |||||
| * \ \ | Merge. | Igor Babaev | 2012-02-22 | 1 | -1/+6 |
| |\ \ \ | | |/ / | |||||
| * | | | Merged MWL#247 into the latest 5.3. | Igor Babaev | 2011-12-31 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * | | | Implementation of the MWL#247: Make the optimizer use extended keys. | Igor Babaev | 2011-12-31 | 1 | -2/+2 |
* | | | | | 5.3.4 merge | Sergei Golubchik | 2012-02-15 | 1 | -1/+6 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc. | Igor Babaev | 2012-02-01 | 1 | -1/+6 |
| |\ \ \ \ | | |/ / / | |/| | / | | | |/ | | |/| | |||||
| | * | | Fixed LP bug #879860. | Igor Babaev | 2011-12-27 | 1 | -0/+4 |
| | * | | Fixed LP bug #904345. | Igor Babaev | 2011-12-27 | 1 | -1/+2 |
* | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -3/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with 5.1 & fixes to IGNORE handling | Michael Widenius | 2011-12-11 | 1 | -2/+4 |
| |\ \ \ | |||||
| | * \ \ | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+4 |
| | |\ \ \ | | | |/ / | | | | / | | | |/ | | |/| | |||||
| | | * | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+4 |
| | | |\ | |||||
| | | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+4 |
| | | | |\ | |||||
| | | | | * | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -13/+32 |
| | | | | |\ | |||||
| * | | | | | | BUG#901032: Wrong result for MIN/MAX on an indexed column with materializatio... | Sergey Petrunya | 2011-12-08 | 1 | -1/+2 |
| |/ / / / / |