Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '5.5' into 10.1 | Sergei Golubchik | 2019-04-26 | 1 | -0/+21 |
|\ | |||||
| * | MDEV-18507 can't update temporary table when joined with table with triggers ... | Sergei Golubchik | 2019-04-24 | 1 | -0/+21 |
* | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-06-28 | 1 | -0/+32 |
|\ \ | |||||
| * | | MDEV-5973: MySQL Bug#11757486:49539: NON-DESCRIPTIVE ERR (ERROR 0 FROM STORA... | Oleksandr Byelkin | 2016-06-21 | 1 | -0/+32 |
* | | | MDEV-3929 Add system variable explicit_defaults_for_timestamp for compatibili... | Alexander Barkov | 2015-09-22 | 1 | -2/+2 |
* | | | MDEV-6066: Merge new defaults from 5.6 and 5.7 (defaults changed, QC can be s... | Oleksandr Byelkin | 2015-09-04 | 1 | -0/+1 |
|/ / | |||||
* | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-05-04 | 1 | -0/+194 |
|\ \ | |/ | |||||
| * | MDEV-8018: main.multi_update fails with --ps-protocol | Oleksandr Byelkin | 2015-04-22 | 1 | -0/+5 |
| * | MDEV-7613: MariaDB 5.5.40 server crash on update table left join with a view | Oleksandr Byelkin | 2015-04-15 | 1 | -0/+189 |
* | | 5.5 merge | Sergei Golubchik | 2014-05-09 | 1 | -0/+29 |
|\ \ | |/ | |||||
| * | MDEV-6193: Problems with multi-table updates that JOIN against read-only table | unknown | 2014-05-08 | 1 | -0/+10 |
| * | MDEV-6139: UPDATE w/ join against MRG_MyISAM table with read-only sub-table f... | unknown | 2014-04-28 | 1 | -0/+19 |
* | | Fixed the problem of mdev-5970: | Igor Babaev | 2014-04-17 | 1 | -0/+22 |
* | | Fixes for CREATE_OR_REPLACE | Michael Widenius | 2014-01-31 | 1 | -3/+3 |
* | | MDEV-5115 RBR from MySQL 5.6 to MariaDB 10.0 does not work | Sergei Golubchik | 2013-12-09 | 1 | -2/+2 |
* | | more post-merge fixes: | Sergei Golubchik | 2013-07-21 | 1 | -3/+3 |
* | | Merge 10.0-base -> 10.0 (GTID). | unknown | 2013-04-17 | 1 | -2/+2 |
|\ \ | |||||
| * \ | MDEV-26: Global transaction ID. First alpha release. | unknown | 2013-04-15 | 1 | -2/+2 |
| |\ \ | | |/ | |/| | |||||
| | * | MDEV-26: Global transaction ID | unknown | 2013-03-26 | 1 | -2/+2 |
* | | | 10.0-base merge | Sergei Golubchik | 2013-04-15 | 1 | -0/+53 |
|\ \ \ | |/ / | |||||
| * | | 5.3->5.5 merge | Sergei Golubchik | 2013-02-28 | 1 | -0/+53 |
| |\ \ | | |/ | |/| | |||||
| | * | MDEV-4123 fix. | unknown | 2013-02-11 | 1 | -0/+51 |
* | | | fixes for test failures | Sergei Golubchik | 2012-09-27 | 1 | -2/+2 |
|/ / | |||||
* | | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 1 | -2/+5 |
|\ \ | |||||
| * | | fixing test failure on pb2. | Rohit Kalhans | 2012-02-13 | 1 | -4/+0 |
| * | | BUG#11758263: Modification of indentation in the added code. | Rohit Kalhans | 2012-02-13 | 1 | -2/+9 |
* | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -2/+2 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge with 5.1 & fixes to IGNORE handling | Michael Widenius | 2011-12-11 | 1 | -2/+2 |
* | | | after merge changes: | Sergei Golubchik | 2011-12-12 | 1 | -1/+1 |
* | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -1/+6 |
|\ \ \ | |/ / | | / | |/ |/| | |||||
| * | Merge of mwl #106 into 5.3. | Igor Babaev | 2011-06-15 | 1 | -0/+5 |
| |\ | |||||
| | * | Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed. | Igor Babaev | 2011-06-04 | 1 | -0/+5 |
| | |\ | |||||
| | | * | Applied Sanja's patch to fix LP bug #784297 in the tree for mwl106. | Igor Babaev | 2011-05-27 | 1 | -0/+11 |
| | | * | Merged the code of MWL#106 into 5.3 | Igor Babaev | 2011-05-16 | 1 | -6/+0 |
| | | |\ | |||||
| * | | \ | merge with 5.1-micro | Sergei Golubchik | 2011-06-07 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| | | |||||
* | | | | BUG#11882110: UPDATE REPORTS ER_KEY_NOT_FOUND IF TABLE IS | Jorgen Loland | 2011-06-16 | 1 | -1/+37 |
* | | | | BUG#11762751: UPDATE STATEMENT THROWS AN ERROR, BUT STILL | Jorgen Loland | 2011-02-21 | 1 | -0/+17 |
* | | | | 5.1-bugteam->5.5-bugteam merge | Sergey Glukhov | 2010-12-14 | 1 | -0/+11 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed following problems: | Sergey Glukhov | 2010-12-14 | 1 | -0/+11 |
| |/ / | |||||
* | | | Merge of fix for Bug#54543. Test case only (bug is not present in this tree). | Martin Hansson | 2010-09-07 | 1 | -0/+20 |
|\ \ \ | |/ / | |||||
| * | | Bug#54543: update ignore with incorrect subquery leads to assertion failure: | Martin Hansson | 2010-09-07 | 1 | -0/+20 |
* | | | Manual merge | unknown | 2010-05-26 | 1 | -6/+10 |
|\ \ \ | |/ / | |||||
| * | | Bug #49741 test files contain explicit references to bin/relay-log positions | unknown | 2010-05-24 | 1 | -6/+0 |
| |/ | |||||
* | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-02-24 | 1 | -0/+11 |
|\ \ | |||||
| * \ | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge. | Alexey Kopytov | 2010-02-22 | 1 | -0/+11 |
| |\ \ | | |/ | |||||
| | * | Bug#49534: multitable IGNORE update with sql_safe_updates | Martin Hansson | 2010-02-10 | 1 | -0/+11 |
* | | | WL#2687 WL#5072 BUG#40278 BUG#47175 | Alfranio Correia | 2009-11-03 | 1 | -2/+2 |
|/ / | |||||
* | | backporting bug@27808 fixes | Andrei Elkin | 2009-10-01 | 1 | -2/+2 |
|/ | |||||
* | Merge 5.0 -> 5.1 | Matthias Leich | 2009-02-09 | 1 | -5/+5 |
|\ |