| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-12-21 | 1 | -9/+9 |
| |\ | |||||
| | * | Fixes to get all test to run on MacosX Lion 10.7 | Monty | 2015-11-29 | 1 | -9/+9 |
| | * | Merge branch 'mdev7818-4' into bb-10.0-knielsen | Kristian Nielsen | 2015-11-13 | 1 | -1/+6 |
| | |\ | |||||
| | * | | MDEV-8476 Race condition in slave SQL thread shutdown | Monty | 2015-11-12 | 1 | -4/+14 |
| * | | | Merge branch 'github/10.0-galera' into 10.1 | Sergei Golubchik | 2015-11-19 | 1 | -21/+60 |
| |\ \ \ | |||||
| | * \ \ | Merge tag 'mariadb-10.0.22' into 10.0-galera | Nirbhay Choubey | 2015-10-31 | 1 | -0/+6 |
| | |\ \ \ | | |/ / | |||||
| | * | | | refs codership/mysql-wsrep#188 | Nirbhay Choubey | 2015-09-10 | 1 | -0/+2 |
| | * | | | refs codership/mysql-wsrep#181 | Nirbhay Choubey | 2015-09-10 | 1 | -20/+59 |
| | * | | | Merge tag 'mariadb-10.0.21' into 10.0-galera | Nirbhay Choubey | 2015-08-08 | 1 | -10/+2 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge tag 'mariadb-10.0.20' into 10.0-galera | Nirbhay Choubey | 2015-06-21 | 1 | -6/+19 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge tag 'mariadb-10.0.19' into 10.0-galera | Nirbhay Choubey | 2015-05-09 | 1 | -26/+122 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge tag 'mariadb-10.0.17' into 10.0-galera | Nirbhay Choubey | 2015-02-27 | 1 | -3/+15 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | maria-10.0.16 merge | Nirbhay Choubey | 2015-01-26 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | bzr merge -rtag:mariadb-10.0.15 maria/10.0 | Nirbhay Choubey | 2014-12-05 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | bzr merge -rtag:mariadb-10.0.14 maria/10.0/ | Nirbhay Choubey | 2014-09-28 | 1 | -5/+90 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | bzr merge -r4346 maria/10.0 (maria-10.0.13) | Nirbhay Choubey | 2014-08-11 | 1 | -80/+141 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | bzr merge -rtag:mariadb-10.0.12 maria/10.0 | Nirbhay Choubey | 2014-06-19 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Fix for a build failure. | Nirbhay Choubey | 2014-05-21 | 1 | -0/+1 |
| | * | | | | | | | | | | | | bzr merge -r3968..3984 codership/5.5 (non-Innodb changes only). | Nirbhay Choubey | 2014-05-21 | 1 | -16/+35 |
| | * | | | | | | | | | | | | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 1 | -11/+8 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merging mariadb-10.0.10. | Nirbhay Choubey | 2014-04-08 | 1 | -11/+74 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merging revision from codership-mysql/5.5 (r3928..3968) and | Nirbhay Choubey | 2014-03-27 | 1 | -0/+16 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | bzr merge -r4062..4065 codership/5.6 | Nirbhay Choubey | 2014-03-26 | 1 | -0/+1 |
| | | * | | | | | | | | | | | | | | bzr merge -r3946..3968 codership/5.5 | Nirbhay Choubey | 2014-03-25 | 1 | -0/+15 |
| | * | | | | | | | | | | | | | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 1 | -35/+83 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | Merge MariaDB-10.0.7 revision 3961. | Jan Lindström | 2014-01-25 | 1 | -5/+14 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 | Seppo Jaakola | 2013-12-04 | 1 | -346/+583 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | Merge fix. | Jan Lindström | 2013-09-09 | 1 | -17/+0 |
| | * | | | | | | | | | | | | | | | | | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 1 | -57/+105 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merged with lp:maria revision #3766 | Seppo Jaakola | 2013-07-13 | 1 | -54/+325 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -0/+25 |
| * | | | | | | | | | | | | | | | | | | | | Incorrect statements binlogged on slave with do_domain_ids=(...) | Nirbhay Choubey | 2015-11-18 | 1 | -16/+3 |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'mdev7818-4' into 10.1 | Kristian Nielsen | 2015-11-13 | 1 | -1/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | Change Seconds_behind_master to be updated only at commit in parallel replica... | Kristian Nielsen | 2015-11-13 | 1 | -1/+6 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-10-12 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | | MDEV-4487 Allow replication from MySQL 5.6+ when GTID is enabled on the master | Monty | 2015-10-08 | 1 | -0/+6 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | MDEV-8264 encryption for binlog | Sergei Golubchik | 2015-09-04 | 1 | -1/+3 |
| * | | | | | | | | | | | | | | | | | | cleanup: Log_event::write() and MYSQL_BIN_LOG::write_cache() | Sergei Golubchik | 2015-09-04 | 1 | -1/+1 |
| * | | | | | | | | | | | | | | | | | | cleanup: [partial] removal of llstr() | Sergei Golubchik | 2015-09-04 | 1 | -98/+66 |
| * | | | | | | | | | | | | | | | | | | Revert f1abd015, make a smaller fix | Sergei Golubchik | 2015-09-04 | 1 | -2/+6 |
| * | | | | | | | | | | | | | | | | | | cleanup DBUG, DBUG_DUMP_EVENT_BUF | Sergei Golubchik | 2015-09-04 | 1 | -31/+1 |
| * | | | | | | | | | | | | | | | | | | cleanup: use enum_binlog_checksum_alg, not uint8 | Sergei Golubchik | 2015-09-04 | 1 | -5/+5 |
| * | | | | | | | | | | | | | | | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-09-03 | 1 | -10/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | |||||
| | * | | | | | | | | | | | | | | | | | Merge commit '96badb16afcf' into 10.0 | Jan Lindström | 2015-08-03 | 1 | -9/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | | | | | | | | Fixed warnings and errors found by buildbot | Monty | 2015-07-25 | 1 | -9/+1 |
| | | * | | | | | | | | | | | | | | | | | CRLF->LF | Sergei Golubchik | 2015-06-02 | 1 | -2/+2 |
| | * | | | | | | | | | | | | | | | | | | Fixed MDEV-8428: Mangled DML statements on 2nd level slave when enabling binl... | Monty | 2015-07-26 | 1 | -1/+1 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | Merge MDEV-8294 into 10.0 | Kristian Nielsen | 2015-06-10 | 1 | -6/+19 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | Fixed errors and bugs found by valgrind: | Monty | 2015-09-01 | 1 | -4/+14 |
| * | | | | | | | | | | | | | | | | | | MDEV-6152: Remove calls to current_thd while creating Item | Monty | 2015-09-01 | 1 | -1/+1 |
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |