Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/10.1' into 10.2 | Vicențiu Ciorbaru | 2017-12-22 | 1 | -1/+1 |
|\ | |||||
| * | MW-416 | sjaakola | 2017-12-19 | 1 | -1/+1 |
* | | Merge 10.1 to 10.2 | Marko Mäkelä | 2017-12-19 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | MW-416 | sjaakola | 2017-12-18 | 1 | -0/+18 |
* | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-10-24 | 1 | -4/+5 |
|\ \ | |/ | |||||
| * | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-10-22 | 1 | -4/+5 |
| |\ | |||||
| | * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-10-18 | 1 | -4/+5 |
| | |\ | |||||
| | | * | MDEV-13459 Warnings, when compiling with gcc-7.x | Sergei Golubchik | 2017-10-17 | 1 | -3/+5 |
| | * | | Silence bogus GCC 7 warnings -Wimplicit-fallthrough | Marko Mäkelä | 2017-05-17 | 1 | -0/+2 |
| | * | | MDEV-9088 Server crashes on shutdown after the second post of feedback report | Sergei Golubchik | 2015-12-19 | 1 | -3/+0 |
* | | | | MW-416 | sjaakola | 2017-10-10 | 1 | -1/+1 |
* | | | | MW-416 | sjaakola | 2017-10-10 | 1 | -0/+18 |
* | | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT. | Vladislav Vaintroub | 2017-09-28 | 1 | -1/+1 |
* | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-22 | 1 | -0/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Silence bogus GCC 7 warnings -Wimplicit-fallthrough | Marko Mäkelä | 2017-05-17 | 1 | -0/+2 |
* | | | | Reuse THD for new user connections | Monty | 2016-06-04 | 1 | -1/+1 |
* | | | | MDEV-8360 Clean-up CHARSET_INFO: strnncollsp: diff_if_only_endspace_difference | Alexander Barkov | 2016-03-31 | 1 | -1/+1 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-03-23 | 1 | -8/+21 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-717 LP:1003679 - Wrong binlog order on concurrent DROP schema and CREATE... | Alexey Botchkov | 2016-03-23 | 1 | -8/+21 |
* | | | | Removed TABLE->sort to make it possible to have multiple active calls to | Monty | 2016-03-22 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge branch 'github/10.0-galera' into 10.1 | Sergei Golubchik | 2015-11-19 | 1 | -1/+2 |
|\ \ \ | |||||
| * \ \ | Merge tag 'mariadb-10.0.22' into 10.0-galera | Nirbhay Choubey | 2015-10-31 | 1 | -79/+99 |
| |\ \ \ | | |/ / | |||||
| * | | | refs codership/mysql-wsrep#202 Added schema info into wsrep messages | Philip Stoev | 2015-10-19 | 1 | -2/+4 |
| * | | | Fix for build failures on Power8 | Nirbhay Choubey | 2015-02-20 | 1 | -1/+1 |
| * | | | bzr merge -rtag:mariadb-10.0.15 maria/10.0 | Nirbhay Choubey | 2014-12-05 | 1 | -0/+1 |
| |\ \ \ | |||||
| * | | | | bzr merge -r4091..4101 codership/5.6/ | Nirbhay Choubey | 2014-06-19 | 1 | -1/+41 |
| * | | | | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 1 | -0/+2 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merging mariadb-10.0.10. | Nirbhay Choubey | 2014-04-08 | 1 | -0/+3 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge MariaDB-10.0.7 revision 3961. | Jan Lindström | 2014-01-25 | 1 | -3/+4 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 | Seppo Jaakola | 2013-12-04 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Merges from lp:codership-mysql/5.5 up to rev #3893, this changes to wsrep API... | Seppo Jaakola | 2013-11-26 | 1 | -1/+1 |
| * | | | | | | | | | Merge fix. | Jan Lindström | 2013-09-09 | 1 | -0/+1 |
| * | | | | | | | | | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 1 | -7/+18 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| * | | | | | | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -0/+12 |
* | | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-11-19 | 1 | -79/+98 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
| * | | | | | | | | | Allow mysql_upgrade to enable event after table is corrected | Michael Widenius | 2015-10-21 | 1 | -79/+99 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | |||||
* | | | | | | | | | MDEV-6152: Remove calls to current_thd while creating Item | Monty | 2015-08-27 | 1 | -7/+9 |
* | | | | | | | | | Stage 2 of MDEV-6152: | Monty | 2015-08-21 | 1 | -14/+20 |
* | | | | | | | | | MDEV-8010 - Avoid sql_alloc() in Items (Patch #1) | Sergey Vojtovich | 2015-08-21 | 1 | -7/+8 |
* | | | | | | | | | MDEV-7281 EVENT: CREATE OR REPLACE | Alexander Barkov | 2015-02-27 | 1 | -6/+12 |
* | | | | | | | | | don't let current_thd to point to a destroyed THD | Sergei Golubchik | 2015-02-03 | 1 | -2/+0 |
* | | | | | | | | | 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 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | cleanup: galera misc cleanups | Sergei Golubchik | 2014-10-10 | 1 | -17/+0 |
* | | | | | | | | Removed files that had been accidentally committed | Monty | 2014-10-07 | 1 | -2/+5 |
* | | | | | | | | small cleanup | Sergei Golubchik | 2014-10-01 | 1 | -27/+0 |
* | | | | | | | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-27 | 1 | -1/+55 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-26 | 1 | -1/+55 |
| |/ / / / / / / | |||||
* | | | | | | | | Minor cleanups, fix compiler warnings | Monty | 2014-08-09 | 1 | -1/+3 |
|/ / / / / / / |