Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | bzr merge -rtag:mariadb-10.0.15 maria/10.0 | Nirbhay Choubey | 2014-12-05 | 1 | -1/+12 |
|\ | |||||
| * | MDEV-6849 ON UPDATE CURRENT_TIMESTAMP doesn't always work | Sergei Golubchik | 2014-11-13 | 1 | -0/+11 |
| * | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -1/+1 |
* | | bzr merge -r4346 maria/10.0 (maria-10.0.13) | Nirbhay Choubey | 2014-08-11 | 1 | -16/+12 |
|\ \ | |/ | |||||
| * | 5.5.39 merge | Sergei Golubchik | 2014-08-07 | 1 | -1/+1 |
| |\ | |||||
| | * | mysql-5.5.39 merge | Sergei Golubchik | 2014-08-02 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Bug#17283409 4-WAY DEADLOCK: ZOMBIES, PURGING BINLOGS, | Venkatesh Duggirala | 2014-05-08 | 1 | -1/+3 |
| | | * | WL#7076: Backporting wl6715 to support both formats | Ashish Agarwal | 2013-08-23 | 1 | -2/+3 |
| | | |\ | |||||
| | | | * | WL#7076: Backporting wl6715 to support both formats in 5.5, 5.6, 5.7 | Ashish Agarwal | 2013-07-02 | 1 | -2/+3 |
| | | |/ | |||||
| * | | | small cleanup of the SHOW CREATE TABLE code | Sergei Golubchik | 2014-07-08 | 1 | -15/+11 |
* | | | | Merging mariadb-10.0.10. | Nirbhay Choubey | 2014-04-08 | 1 | -90/+28 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed that the we don't change CREATE to CREATE OR REPLACE, except if the sla... | Michael Widenius | 2014-03-28 | 1 | -2/+3 |
| * | | | MDEV-5930 Server crashes in thd_get_ha_data on CREATE OR REPLACE TABLE | Michael Widenius | 2014-03-23 | 1 | -2/+1 |
| * | | | MDEV-5433 select_result::send_error() is unused | Sergei Golubchik | 2014-03-26 | 1 | -40/+0 |
| * | | | Fix for MDEV-5589: "Discrepancy in binlog on half-failed CREATE OR REPLACE" | Michael Widenius | 2014-03-20 | 1 | -2/+14 |
| * | | | MDEV-9095: Executing triggers on slave in row-based replication | unknown | 2014-03-19 | 1 | -44/+6 |
| * | | | MDEV-5619: CREATE OR REPLACE does not release MDL_EXCLUSIVE upon failure | Michael Widenius | 2014-03-12 | 1 | -1/+7 |
* | | | | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 1 | -70/+138 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-5314 - Compiling fails on OSX using clang | Sergey Vojtovich | 2014-02-19 | 1 | -4/+4 |
| * | | | MDEV-5492 - Reduce usage of LOCK_open: TABLE::in_use | Sergey Vojtovich | 2014-02-13 | 1 | -1/+1 |
| * | | | Automatic merge | Michael Widenius | 2014-02-05 | 1 | -64/+121 |
| |\ \ \ | |||||
| | * | | | Replication changes for CREATE OR REPLACE TABLE | Michael Widenius | 2014-02-05 | 1 | -5/+17 |
| | * | | | Implementation of MDEV-5491: CREATE OR REPLACE TABLE | Michael Widenius | 2014-01-29 | 1 | -60/+105 |
| | * | | | Fixes to get valgrind to work with jemalloc | Michael Widenius | 2014-01-02 | 1 | -1/+1 |
| * | | | | 10.0-base merge | Sergei Golubchik | 2014-02-03 | 1 | -2/+10 |
| |\ \ \ \ | |||||
| | * \ \ \ | 5.5 merge | Sergei Golubchik | 2014-02-01 | 1 | -2/+10 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| | | * | | | Fix for MDEV-5168: MariaDB returns warnings for INSERT IGNORE | Michael Widenius | 2014-01-26 | 1 | -2/+6 |
| | | * | | | Fix for MDEV-5531: double call procedure in one session - hard shutdown the s... | Michael Widenius | 2014-01-24 | 1 | -0/+3 |
| * | | | | | MDEV-5426: Assertion `toku_ft_needed_unlocked(src_h)' failed (errno=11) ... | Sergey Petrunya | 2014-01-21 | 1 | -1/+2 |
| | |_|/ / | |/| | | | |||||
* | | | | | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 | Seppo Jaakola | 2013-12-04 | 1 | -6/+51 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication. | unknown | 2013-11-01 | 1 | -4/+4 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge MDEV-4506: Parallel replication into 10.0-base. | unknown | 2013-11-01 | 1 | -4/+4 |
| | |\ \ \ | |||||
| | | * | | | MDEV-4506: Parallel replication: Intermediate commit | unknown | 2013-07-12 | 1 | -4/+4 |
| * | | | | | Merge 10.0-base -> 10.0 | Sergey Petrunya | 2013-10-16 | 1 | -2/+47 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | MDEV-3798: [SHOW] EXPLAIN UPDATE/DELETE, Memory leak in binlog.binlog_base64_... | Sergey Petrunya | 2013-10-16 | 1 | -0/+1 |
| | * | | | | MDEV-3798: EXPLAIN UPDATE/DELETE | Sergey Petrunya | 2013-10-14 | 1 | -2/+3 |
| | * | | | | MDEV-3798: EXPLAIN UPDATE/DELETE | Sergey Petrunya | 2013-10-14 | 1 | -2/+1 |
| | * | | | | MDEV-5122: "Commands out of sync", "Malformed packet" or client hang up... | Sergey Petrunya | 2013-10-11 | 1 | -4/+3 |
| | * | | | | MDEV-3798: EXPLAIN UPDATE/DELETE | Sergey Petrunya | 2013-10-07 | 1 | -1/+46 |
* | | | | | | Merge fix. | Jan Lindström | 2013-09-09 | 1 | -0/+6 |
* | | | | | | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 1 | -75/+74 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | cosmetic fixes | Sergei Golubchik | 2013-07-21 | 1 | -3/+3 |
| * | | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -25/+23 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fixes for innodb suite, merging tests from 5.6. | Sergei Golubchik | 2013-07-15 | 1 | -1/+0 |
| | * | | | | | merge of 2876.430.11 & 2876.430.1 | unknown | 2013-06-27 | 1 | -3/+3 |
| | * | | | | | A fix of unions with duplicate rows and returning bug fix for lp:732124 union... | unknown | 2013-06-26 | 1 | -1/+1 |
| | * | | | | | Fixed memory leaks. alias.test now runs clean with valgrind | Michael Widenius | 2013-06-20 | 1 | -2/+1 |
| | * | | | | | Finished merging wl5986 started by Igor. | unknown | 2013-06-19 | 1 | -1/+1 |
| | * | | | | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -21/+21 |
| * | | | | | | 10.0-base merge | Sergei Golubchik | 2013-07-18 | 1 | -47/+48 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | |