Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/bb-10.2-ext' into 10.3 | Alexander Barkov | 2017-10-30 | 1 | -1/+0 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-10-30 | 1 | -1/+0 |
| |\ | |||||
| | * | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-10-24 | 1 | -1/+0 |
| | |\ | |||||
| | | * | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-10-22 | 1 | -1/+0 |
| | | |\ | |||||
| | | | * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-10-18 | 1 | -1/+0 |
| | | | |\ | |||||
| | | | | * | MDEV-13459 Warnings, when compiling with gcc-7.x | Sergei Golubchik | 2017-10-17 | 1 | -1/+0 |
| | * | | | | Fix warnings in Win64 | Vladislav Vaintroub | 2017-10-11 | 1 | -1/+2 |
* | | | | | | Merge bb-10.2-ext into 10.3 | Marko Mäkelä | 2017-10-04 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-10-02 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT. | Vladislav Vaintroub | 2017-09-28 | 1 | -1/+1 |
* | | | | | | New option for slow logging (log_slow_disable_statements) | Monty | 2017-08-24 | 1 | -5/+5 |
* | | | | | | Enusure that my_global.h is included first | Michael Widenius | 2017-08-24 | 1 | -1/+2 |
* | | | | | | Remove XtraDB | Marko Mäkelä | 2017-06-21 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Fixed compiler warnings and warnings from build.tags | Monty | 2017-05-08 | 1 | -0/+2 |
* | | | | | Changing field::field_name and Item::name to LEX_CSTRING | Monty | 2017-04-23 | 1 | -4/+4 |
* | | | | | MDEV-10139 Support for SEQUENCE objects | Monty | 2017-04-07 | 1 | -6/+7 |
|/ / / / | |||||
* | | | | MDEV-10555: Server crashes in mysql_admin_table upon killing ANALYZE | Oleksandr Byelkin | 2017-03-13 | 1 | -45/+67 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-12-29 | 1 | -1/+13 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-09-28 | 1 | -1/+13 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-09-27 | 1 | -1/+13 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-10424 - Assertion `ticket == __null' failed in MDL_request::set_type | Sergey Vojtovich | 2016-08-17 | 1 | -1/+13 |
* | | | | MDEV-7901: re-implement analyze table for low impact | Oleksandr Byelkin | 2016-08-03 | 1 | -134/+165 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-06-30 | 1 | -10/+27 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-9155 Enabling Defragmenting in 10.1.8 still causes OPTIMIZE TABLE to tak... | Sergei Golubchik | 2016-05-05 | 1 | -7/+26 |
| * | | | comments | Sergei Golubchik | 2016-05-05 | 1 | -5/+3 |
* | | | | various cleanups | Michael Widenius | 2016-06-30 | 1 | -1/+1 |
* | | | | MDEV-5535: Cannot reopen temporary table | Nirbhay Choubey | 2016-06-10 | 1 | -4/+4 |
* | | | | Code cleanups | Sergey Vojtovich | 2016-06-10 | 1 | -1/+4 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-03-23 | 1 | -43/+51 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-9590: Always print "Engine-independent statistic" warnings and might be ... | Oleksandr Byelkin | 2016-03-21 | 1 | -43/+51 |
* | | | | MDEV-9488 - Table cache cleanups | Sergey Vojtovich | 2016-02-26 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch '10.0-galera' into bb-10.1-serg | Nirbhay Choubey | 2016-02-24 | 1 | -4/+3 |
|\ \ \ | |||||
| * \ \ | Merge tag 'mariadb-10.0.24' into 10.0-galera | Nirbhay Choubey | 2016-02-23 | 1 | -4/+11 |
| |\ \ \ | | |/ / | |||||
| * | | | Fix for test failures. | Nirbhay Choubey | 2016-02-23 | 1 | -3/+0 |
| * | | | PXC-391: Avoid Total Order Isolation (TOI) for LOCAL sql admin commands. | Raghavendra D Prabhu | 2016-02-22 | 1 | -2/+3 |
| * | | | Merge tag 'mariadb-10.0.19' into 10.0-galera | Nirbhay Choubey | 2015-05-09 | 1 | -12/+45 |
| |\ \ \ | |||||
| * \ \ \ | bzr merge -rtag:mariadb-10.0.15 maria/10.0 | Nirbhay Choubey | 2014-12-05 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * | | | | | bzr merge -r4104..4120 codership/5.6/ | Nirbhay Choubey | 2014-08-12 | 1 | -0/+1 |
| * | | | | | bzr merge -r4346 maria/10.0 (maria-10.0.13) | Nirbhay Choubey | 2014-08-11 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 1 | -6/+8 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merging mariadb-10.0.10. | Nirbhay Choubey | 2014-04-08 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 1 | -3/+4 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge MariaDB-10.0.7 revision 3961. | Jan Lindström | 2014-01-25 | 1 | -2/+14 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | After merge fixes | Jan Lindström | 2013-09-25 | 1 | -1/+3 |
| * | | | | | | | | | | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 1 | -73/+91 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merged with lp:maria revision #3766 | Seppo Jaakola | 2013-07-13 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -0/+3 |
* | | | | | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-02-23 | 1 | -4/+11 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-02-15 | 1 | -4/+11 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2016-02-09 | 1 | -3/+11 |
| | |\ \ \ \ \ \ \ \ \ \ |