Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merging revision from codership-mysql/5.5 (r3928..3968) and | Nirbhay Choubey | 2014-03-27 | 1 | -1/+6 |
|\ | |||||
| * | bzr merge -r3946..3968 codership/5.5 | Nirbhay Choubey | 2014-03-25 | 1 | -1/+6 |
* | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 1 | -53/+123 |
|\ \ | |/ |/| | |||||
| * | Fixed bug found by Pavel Ivanov in Gtid_log_event. | Michael Widenius | 2014-03-04 | 1 | -14/+12 |
| * | Merge MDEV-5754, MDEV-5769, and MDEV-5764 into 10.0 | unknown | 2014-03-04 | 1 | -9/+28 |
| |\ | |||||
| | * | MDEV-5754: MySQL 5.5 slaves cannot replicate from MariaDB 10.0 | unknown | 2014-03-04 | 1 | -6/+24 |
| | * | MDEV-5764: START SLAVE UNTIL does not work with parallel replication | unknown | 2014-03-03 | 1 | -3/+4 |
| * | | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 1 | -0/+20 |
| |\ \ | |||||
| | * \ | 5.5 merge | Sergei Golubchik | 2014-02-25 | 1 | -0/+20 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | MySQL-5.5.36 merge | Sergei Golubchik | 2014-02-17 | 1 | -0/+20 |
| | | |\ | |||||
| | | | * | Bug#17632978 SLAVE CRASHES IF ROW EVENT IS CORRUPTED | Venkatesh Duggirala | 2013-12-17 | 1 | -0/+9 |
| | | | * | Bug#16736412: THE SERVER WAS CRASHED WHILE EXECUTING | Sujatha Sivakumar | 2013-11-07 | 1 | -3/+3 |
| | | | * | Bug#16736412: THE SERVER WAS CRASHED WHILE EXECUTING | Sujatha Sivakumar | 2013-11-06 | 1 | -0/+11 |
| * | | | | MDEV-5314 - Compiling fails on OSX using clang | Sergey Vojtovich | 2014-02-19 | 1 | -2/+2 |
| * | | | | Merge 10.0-base -> 10.0 | unknown | 2014-02-11 | 1 | -0/+20 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | MDEV-4937: sql_slave_skip_counter does not work with GTID | unknown | 2014-02-11 | 1 | -0/+20 |
| * | | | | Automatic merge | Michael Widenius | 2014-02-05 | 1 | -27/+42 |
| |\ \ \ \ | |||||
| | * | | | | Replication changes for CREATE OR REPLACE TABLE | Michael Widenius | 2014-02-05 | 1 | -12/+27 |
| | * | | | | Fixes to get valgrind to work with jemalloc | Michael Widenius | 2014-01-02 | 1 | -15/+15 |
| * | | | | | 10.0-base merge | Sergei Golubchik | 2014-02-03 | 1 | -4/+2 |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||||
| | * | | | 5.5 merge | Sergei Golubchik | 2014-02-01 | 1 | -3/+1 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | MySQL-5.5.35 merge | Sergei Golubchik | 2014-01-22 | 1 | -3/+1 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Bug#17234370 LAST_INSERT_ID IS REPLICATED INCORRECTLY IF | Venkatesh Duggirala | 2013-10-16 | 1 | -1/+0 |
| | | | |\ | |||||
| | | | | * | Bug#17234370 LAST_INSERT_ID IS REPLICATED INCORRECTLY IF | Venkatesh Duggirala | 2013-10-16 | 1 | -1/+0 |
| | | | | * | Bug#17402313 DUMP THREAD SENDS SOME EVENTS MORE THAN ONCE | Libing Song | 2013-09-10 | 1 | -0/+11 |
| | * | | | | MDEV-5363: Make parallel replication waits killable | unknown | 2013-12-13 | 1 | -1/+1 |
* | | | | | | Merge MariaDB-10.0.7 revision 3961. | Jan Lindström | 2014-01-25 | 1 | -42/+165 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | 10.0-base merge | Sergei Golubchik | 2013-12-16 | 1 | -1/+11 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | 5.5 merge | Sergei Golubchik | 2013-11-23 | 1 | -1/+11 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | mysql-5.5.34 merge | Sergei Golubchik | 2013-11-19 | 1 | -1/+11 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Fix for bug#14188793 - "DEADLOCK CAUSED BY ALTER TABLE DOEN'T CLEAR | Dmitry Lenev | 2013-08-20 | 1 | -1/+11 |
| * | | | | | bugfix: incorrect buffer sizes for net_store_length() | Sergei Golubchik | 2013-12-09 | 1 | -5/+5 |
| * | | | | | MDEV-5115 RBR from MySQL 5.6 to MariaDB 10.0 does not work | Sergei Golubchik | 2013-12-09 | 1 | -36/+149 |
* | | | | | | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 | Seppo Jaakola | 2013-12-04 | 1 | -370/+601 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | 10.0-base merge | Sergei Golubchik | 2013-11-13 | 1 | -3/+3 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | 5.5. merge | Sergei Golubchik | 2013-11-13 | 1 | -3/+3 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | MDEV-4824 userstats - wrong user statistics | Sergei Golubchik | 2013-11-11 | 1 | -3/+3 |
| * | | | | | Merge 10.0-base to 10.0 | unknown | 2013-11-07 | 1 | -1/+0 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | MDEV-4506: Parallel replication. | unknown | 2013-11-05 | 1 | -1/+0 |
| * | | | | | Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication. | unknown | 2013-11-01 | 1 | -254/+289 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge MDEV-4506: Parallel replication into 10.0-base. | unknown | 2013-11-01 | 1 | -254/+289 |
| | |\ \ \ \ | |||||
| | | * | | | | MDEV-5206: Incorrect slave old-style position in MDEV-4506, parallel replicat... | unknown | 2013-10-31 | 1 | -5/+11 |
| | | * | | | | MDEV-4506: Parallel replication. | unknown | 2013-10-23 | 1 | -25/+7 |
| | | * | | | | MDEV-4506: Parallel replication: Intermediate commit. | unknown | 2013-10-17 | 1 | -27/+29 |
| | | * | | | | Moved the remaining variables, that depends on sql execution, from Relay_log_... | Michael Widenius | 2013-10-15 | 1 | -6/+6 |
| | | * | | | | Fixes for parallel slave: | Michael Widenius | 2013-10-14 | 1 | -87/+67 |
| | | * | | | | MDEV-4506: parallel replication. | unknown | 2013-09-16 | 1 | -45/+45 |
| | | * | | | | MDEV-4506, parallel replication. | unknown | 2013-09-13 | 1 | -37/+35 |
| | | * | | | | MDEV-4506: Parallel replication: Intermediate commit | unknown | 2013-07-12 | 1 | -10/+10 |
| | | * | | | | MDEV-4506: Parallel replication: intermediate commit. | unknown | 2013-07-08 | 1 | -1/+1 |