| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch '10.2' into bb-10.2-jan | Sergei Golubchik | 2016-09-19 | 1 | -7/+40 |
| |\ | |||||
| | * | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-09-09 | 1 | -7/+40 |
| | |\ | |||||
| | | * | cleanup: don't copy-paste, don't current_thd | Sergei Golubchik | 2016-09-05 | 1 | -36/+23 |
| | | * | Merge branch '10.0-galera' into bb-10.1-serg | Nirbhay Choubey | 2016-08-25 | 1 | -0/+33 |
| | | |\ | |||||
| | | | * | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-08-24 | 1 | -2/+12 |
| | | | |\ | |||||
| | | | * | | MW-269 Fix outstanding issues with wsrep_max_ws_rows | Daniele Sciascia | 2016-07-25 | 1 | -3/+3 |
| | | | * | | MW-265 Add support for wsrep_max_ws_rows | Daniele Sciascia | 2016-07-19 | 1 | -0/+33 |
| | | | * | | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2016-04-29 | 1 | -3/+4 |
| | | | |\ \ | |||||
| | | | * \ \ | Merge tag 'mariadb-10.0.24' into 10.0-galera | Nirbhay Choubey | 2016-02-23 | 1 | -1/+1 |
| | | | |\ \ \ | |||||
| | | | * \ \ \ | Merge tag 'mariadb-10.0.23' into 10.0-galera | Nirbhay Choubey | 2015-12-19 | 1 | -1/+1 |
| | | | |\ \ \ \ | |||||
| | | | * \ \ \ \ | Merge tag 'mariadb-10.0.21' into 10.0-galera | Nirbhay Choubey | 2015-08-08 | 1 | -0/+20 |
| | | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge tag 'mariadb-10.0.20' into 10.0-galera | Nirbhay Choubey | 2015-06-21 | 1 | -32/+53 |
| | | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | Merge tag 'mariadb-10.0.19' into 10.0-galera | Nirbhay Choubey | 2015-05-09 | 1 | -0/+25 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | refs codership/mysql-wsrep#90 made wsrep_OSU_method session variable | Teemu Ollakka | 2015-05-08 | 1 | -2/+2 |
| | | | * | | | | | | | | refs codership/mysql-wsrep#90 - fixed race in OSU | Teemu Ollakka | 2015-05-08 | 1 | -2/+2 |
| | | | * | | | | | | | | Refs codership/mysql-wsrep#33 | Alexey Yurchenko | 2015-05-08 | 1 | -2/+3 |
| | | | * | | | | | | | | Merge tag 'mariadb-10.0.17' into 10.0-galera | Nirbhay Choubey | 2015-02-27 | 1 | -1/+7 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ | maria-10.0.16 merge | Nirbhay Choubey | 2015-01-26 | 1 | -3/+1 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ | bzr merge -rtag:mariadb-10.0.15 maria/10.0 | Nirbhay Choubey | 2014-12-05 | 1 | -8/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ | bzr merge -rtag:mariadb-10.0.14 maria/10.0/ | Nirbhay Choubey | 2014-09-28 | 1 | -8/+3 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ | bzr merge -r4346 maria/10.0 (maria-10.0.13) | Nirbhay Choubey | 2014-08-11 | 1 | -1/+19 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 1 | -5/+42 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merged revision 3471, 3472 & 3473 from maria-5.5-galera. | Nirbhay Choubey | 2014-03-28 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | | | | | | Merged r3466 from maria-5.5-galera. | Nirbhay Choubey | 2014-03-27 | 1 | -1/+1 |
| | | | * | | | | | | | | | | | | | | | Merging revision from codership-mysql/5.5 (r3928..3968) and | Nirbhay Choubey | 2014-03-27 | 1 | -7/+46 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | | | | | | | | | * bzr merge -r4027..4061 codership/5.6 | Nirbhay Choubey | 2014-03-26 | 1 | -2/+21 |
| | | | | * | | | | | | | | | | | | | | | bzr merge -r3946..3968 codership/5.5 | Nirbhay Choubey | 2014-03-25 | 1 | -5/+31 |
| | | | | |/ / / / / / / / / / / / / / | |||||
| | | | * | | | | | | | | | | | | | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 1 | -48/+96 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | | | | Merge MariaDB-10.0.7 revision 3961. | Jan Lindström | 2014-01-25 | 1 | -3/+15 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 | Seppo Jaakola | 2013-12-04 | 1 | -11/+60 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | | | bzr merge -r3895..3903 lp:codership-mysql/5.5 | Seppo Jaakola | 2013-11-26 | 1 | -17/+8 |
| | | | * | | | | | | | | | | | | | | | | | After merge fixes | Jan Lindström | 2013-09-25 | 1 | -14/+0 |
| | | | * | | | | | | | | | | | | | | | | | Merge fix. | Jan Lindström | 2013-09-09 | 1 | -2/+0 |
| | | | * | | | | | | | | | | | | | | | | | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 1 | -105/+404 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merged with lp:maria revision #3766 | Seppo Jaakola | 2013-07-13 | 1 | -7/+28 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -1/+129 |
| | | * | | | | | | | | | | | | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 1 | -2/+12 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | | | | | | | | Fixed compiler error and some warnings on windows | Monty | 2016-08-23 | 1 | -1/+1 |
| | | | * | | | | | | | | | | | | | | | | | | | Added new status variables to make it easier to debug certain problems: | Monty | 2016-08-21 | 1 | -0/+9 |
| | | | * | | | | | | | | | | | | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-08-10 | 1 | -1/+2 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | |||||
| | | | | * | | | | | | | | | | | | | | | | | | MDEV-6581 Writing to TEMPORARY TABLE not possible in read-only | Sergei Golubchik | 2016-08-03 | 1 | -1/+2 |
| | | * | | | | | | | | | | | | | | | | | | | | MDEV-10478: Trx abort does not work in autocommit mode | Nirbhay Choubey | 2016-08-01 | 1 | -3/+6 |
| * | | | | | | | | | | | | | | | | | | | | | | misc after-merge changes: | Sergei Golubchik | 2016-09-10 | 1 | -12/+1 |
| * | | | | | | | | | | | | | | | | | | | | | | Merge InnoDB 5.7 from mysql-5.7.14. | Jan Lindström | 2016-09-08 | 1 | -2/+14 |
| |/ / / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-06-30 | 1 | -8/+120 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-06-28 | 1 | -0/+95 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | | | | MDEV-10235: Deadlock in CREATE TABLE .. AS SELECT .. if result set is empty i... | Nirbhay Choubey | 2016-06-27 | 1 | -5/+22 |
| | * | | | | | | | | | | | | | | | | | | | | MDEV-9853: WSREP says it cannot get fake InnoDB transaction ID followed by se... | Nirbhay Choubey | 2016-05-05 | 1 | -1/+0 |
| | * | | | | | | | | | | | | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-05-04 | 1 | -2/+3 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | |||||
| | | * | | | | | | | | | | | | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-04-26 | 1 | -2/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / | |||||
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |