| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-06-21 | 1 | -1/+8 |
| |\ | |||||
| | * | MDEV-13577 slave_parallel_mode=optimistic should not report the mode's specif... | Sergei Golubchik | 2018-06-20 | 1 | -3/+0 |
| | * | Merge branch '10.0-galera' into 10.1 | Vicențiu Ciorbaru | 2018-06-12 | 1 | -0/+7 |
| | |\ | |||||
| | | * | Merge tag 'mariadb-10.0.35' into 10.0-galera | Jan Lindström | 2018-05-07 | 1 | -15/+4 |
| | | |\ | |||||
| | | * \ | Merge remote-tracking branch 'origin/5.5-galera' into 10.0-galera | Jan Lindström | 2018-05-07 | 1 | -0/+6 |
| | | |\ \ | |||||
| | | | * \ | Merge tag 'mariadb-5.5.60' into 5.5-galera | Jan Lindström | 2018-04-24 | 1 | -1/+2 |
| | | | |\ \ | |||||
| | | | * | | | MW-322 - CTAS fix merged to 5.5-v25 branch | sjaakola | 2017-07-20 | 1 | -0/+5 |
| | | | * | | | Merge tag 'mariadb-5.5.56' into 5.5-galera | Sachin Setiya | 2017-05-03 | 1 | -1/+1 |
| | | | |\ \ \ | |||||
| | | | * \ \ \ | Merge tag 'mariadb-5.5.55' into bb-5.5-sachin-merge | Sachin Setiya | 2017-04-18 | 1 | -3/+2 |
| | | | |\ \ \ \ | |||||
| | | | * \ \ \ \ | Merge tag 'mariadb-5.5.54' into 5.5-galeramariadb-galera-5.5.54 | Nirbhay Choubey | 2016-12-27 | 1 | -1/+1 |
| | | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge tag 'mariadb-5.5.51' into 5.5-galera | Nirbhay Choubey | 2016-08-10 | 1 | -1/+2 |
| | | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | Merge tag 'mariadb-5.5.49' into 5.5-galera | Nirbhay Choubey | 2016-04-25 | 1 | -2/+2 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ | Merge branch '5.5' into 5.5-galera | Nirbhay Choubey | 2015-02-18 | 1 | -3/+1 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ | bzr merge -rtag:mariadb-5.5.40 maria/5.5 | Nirbhay Choubey | 2014-10-09 | 1 | -8/+3 |
| | | | |\ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ | Local merge of mariadb-5.5.39 | Nirbhay Choubey | 2014-08-06 | 1 | -0/+12 |
| | | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ | bzr merge -rtag:mariadb-5.5.38 maria/5.5 | Nirbhay Choubey | 2014-06-10 | 1 | -0/+4 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge from lp:maria/5.5 to maria-5.5.37 release revision 4154. | Jan Lindström | 2014-04-16 | 1 | -5/+2 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | * Merged revisions 3945, 3946..3950, 3951..3961 | Nirbhay Choubey | 2014-02-28 | 1 | -12/+32 |
| | | | * | | | | | | | | | | | | | MDEV#5534: mysql_tzinfo_to_sql generates wrong query | Nirbhay Choubey | 2014-02-14 | 1 | -1/+1 |
| | | | * | | | | | | | | | | | | | Merge of maria/5.5 into maria-5.5-galera. | Nirbhay Choubey | 2014-01-29 | 1 | -1/+14 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | Merging revision 3839..3932 from codership-mysql/5.5. | Nirbhay Choubey | 2014-01-09 | 1 | -6/+6 |
| | | | * | | | | | | | | | | | | | | MDEV-4108 Compilation warnings with RelWithDebInfo | Nirbhay Choubey | 2013-11-25 | 1 | -0/+7 |
| | | | * | | | | | | | | | | | | | | Merge with MariaDB 5.5.34. | Jan Lindström | 2013-11-25 | 1 | -3/+9 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | Merged revisions 2925--3929 from from lp:~codership/codership-mysql/5.5-23 | Jan Lindström | 2013-11-25 | 1 | -13/+2 |
| | | | * | | | | | | | | | | | | | | | mariadb-5.5.33 merge | Sergei Golubchik | 2013-09-18 | 1 | -0/+6 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge with mariadb 5.5: bzr merge lp:maria/5.5 --rtag:mariadb-5.5.32 | Seppo Jaakola | 2013-08-21 | 1 | -0/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | References: MDEV-4572 - merge with mariaDB 5.5.31 | Seppo Jaakola | 2013-05-26 | 1 | -7/+28 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | References lp:1115708 - merged with lp:mariadb/5.5 revision 3657 | Seppo Jaakola | 2013-02-05 | 1 | -9/+57 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | References lp:1066784 - bzr merge lp:maria/5.5 (rev: 3562) | Seppo Jaakola | 2012-10-24 | 1 | -27/+59 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | | | | | | References lp:1066784 | Seppo Jaakola | 2012-10-23 | 1 | -0/+21 |
| | | | * | | | | | | | | | | | | | | | | | | | | References lp:1051808 - merged with lp:maria/5.5 | Seppo Jaakola | 2012-09-17 | 1 | -3/+20 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | | | | | | | References lp:1051808 - merged with lp:codership-mysql 5.5.27 based trunk | Seppo Jaakola | 2012-09-17 | 1 | -1/+3 |
| | | | * | | | | | | | | | | | | | | | | | | | | | References lp:1034621 - Merge up to mysql-5.5.25 level | Seppo Jaakola | 2012-08-09 | 1 | -4/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | references lp:1011983 | Seppo Jaakola | 2012-06-12 | 1 | -4/+10 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge with mariaDB 5.5.23: bzr merge lp:maria/5.5 | Seppo Jaakola | 2012-04-26 | 1 | -1/+1 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | Initial push of codership-wsrep API implementation for MariaDB. | Seppo Jaakola | 2012-04-13 | 1 | -1/+106 |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge tag 'mariadb-10.0.34' into 10.0-galeramariadb-galera-10.0.34 | Jan Lindström | 2018-02-01 | 1 | -7/+7 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge tag 'mariadb-10.0.33' into bb-10.0-galerabb-10.0-sachin-galera | Sachin Setiya | 2017-11-03 | 1 | -9/+34 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | MDEV-13577 slave_parallel_mode=optimistic should not report the mode's | Andrei Elkin | 2018-06-12 | 1 | -1/+4 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove most 'register' use in C++ | Marko Mäkelä | 2018-04-24 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-04-24 | 1 | -13/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge 10.0 into 10.1 | Marko Mäkelä | 2018-04-24 | 1 | -13/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2018-04-20 | 1 | -13/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | MDEV-14185 CREATE TEMPORARY TABLE AS SELECT causes error 1290 with read_only ... | Alexey Botchkov | 2018-04-08 | 1 | -1/+1 |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | MDEV-14185 CREATE TEMPORARY TABLE AS SELECT causes error 1290 with read_only ... | Alexey Botchkov | 2018-04-07 | 1 | -1/+2 |
| | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | |||||
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | MDEV-12230 include/my_sys.h:600:43: error: unknown type name ‘PSI_file_keyâ... | Sergei Golubchik | 2017-04-20 | 1 | -1/+1 |
| | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix unused variable thd warning in embedded | Vicențiu Ciorbaru | 2018-03-22 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'origin/10.1' into 10.2 | Vicențiu Ciorbaru | 2018-03-16 | 1 | -56/+24 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '10.1' into MDEV-13549-fixes-for-galera_var_max_ws_rows | Jan Lindström | 2018-03-15 | 1 | -2/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge 10.0 into 10.1 | Marko Mäkelä | 2018-03-09 | 1 | -2/+4 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |||||
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |