| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'github/10.0' into 10.1 | Sergei Golubchik | 2018-02-02 | 1 | -2/+2 |
| |\ | |||||
| | * | Fix for MDEV-14141 Crash in print_keydup_error() | Monty | 2018-01-24 | 1 | -2/+2 |
| * | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-09-28 | 1 | -0/+13 |
| |\ \ | |/ | |||||
| | * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-09-27 | 1 | -0/+13 |
| | |\ | |||||
| | | * | MDEV-10424 - Assertion `ticket == __null' failed in MDL_request::set_type | Sergey Vojtovich | 2016-08-17 | 1 | -0/+13 |
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-03-21 | 1 | -1/+1 |
| |\ \ \ | |/ / | |||||
| | * | | Fix spelling: occurred, execute, which etc | Otto Kekäläinen | 2016-03-04 | 1 | -1/+1 |
| * | | | MDEV-6066: Merge new defaults from 5.6 and 5.7 (defaults changed, QC can be s... | Oleksandr Byelkin | 2015-09-04 | 1 | -6/+7 |
| |/ / | |||||
| * | | 10.0-base merge | Sergei Golubchik | 2013-12-16 | 1 | -0/+9 |
| |\ \ | |/ | |||||
| | * | 5.3 merge | Sergei Golubchik | 2013-12-13 | 1 | -0/+9 |
| | |\ | |||||
| | | * | 5.2 merge | Sergei Golubchik | 2013-12-02 | 1 | -0/+9 |
| | | |\ | |||||
| | | | * | MDEV-5266 MySQL:57657 - Temporary MERGE table with temporary underlying is br... | Sergei Golubchik | 2013-11-29 | 1 | -0/+9 |
| * | | | | MDEV-5042 - Server crashes when accessing incorrect MERGE table from trigger | Sergey Vojtovich | 2013-10-14 | 1 | -3/+2 |
| * | | | | MDEV-4879 - Merge test cases for new CREATE TEMPORARY TABLE privilege model | Sergey Vojtovich | 2013-09-20 | 1 | -0/+80 |
| |/ / / | |||||
| * | | | 5.3 merge | Sergei Golubchik | 2013-03-27 | 1 | -24/+62 |
| |\ \ \ | |/ / | |||||
| | * | | MDEV-4277: Crash inside mi_killed_in_mariadb() with myisammrg | Sergey Petrunya | 2013-03-21 | 1 | -0/+35 |
| | |/ | |||||
| | * | Merge with MYSQL 5.1.61 | Michael Widenius | 2012-02-20 | 1 | -3/+7 |
| | |\ | |||||
| | | * | Post push fix for merge.test and mysqlcheck.test on windows | Mattias Jonsson | 2011-12-15 | 1 | -3/+7 |
| | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -0/+45 |
| | |\ \ | | |/ | |||||
| | | * | BUG#11763712 - 56458: KILLING A FLUSH TABLE FOR A MERGE/CHILD | Sergey Vojtovich | 2011-08-18 | 1 | -0/+45 |
| * | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -1/+26 |
| |\ \ \ | |||||
| | * | | | Fix for bug #11754210 - "45777: CHECK TABLE DOESN'T | Dmitry Lenev | 2011-07-22 | 1 | -1/+26 |
| * | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -15/+0 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | Merge with MySQL 5.1.52 | Michael Widenius | 2010-11-23 | 1 | -0/+78 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | | * | | Bug#46339 - crash on REPAIR TABLE merge table USE_FRM | Ingo Struewing | 2010-04-26 | 1 | -0/+78 |
| * | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -1/+138 |
| |\ \ \ \ | | |_|/ | |/| | | |||||
| | * | | | Bug #57002 Assert in upgrade_shared_lock_to_exclusive() | Jon Olav Hauglid | 2010-10-06 | 1 | -1/+23 |
| | * | | | Bug #56494 Segfault in upgrade_shared_lock_to_exclusive() for | Jon Olav Hauglid | 2010-09-22 | 1 | -0/+108 |
| | * | | | Fix for merge.test failures in mysql-5.5-runtime | Dmitry Lenev | 2010-09-16 | 1 | -48/+0 |
| | * | | | Fix for bug #56251 "Deadlock with INSERT DELAYED and MERGE | Dmitry Lenev | 2010-09-15 | 1 | -0/+56 |
| | * | | | Bug #56292 Deadlock with ALTER TABLE and MERGE tables | Jon Olav Hauglid | 2010-09-08 | 1 | -2/+1 |
| * | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -13/+39 |
| |\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| | * | | Fix for: LP #634955: Assert in _ma_update_at_original_place() | Michael Widenius | 2010-11-02 | 1 | -12/+33 |
| | * | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -0/+72 |
| | |\ \ | | |/ | |||||
| | * | | Merge Mysql 5.1.39 merge into MariaDB trunk | unknown | 2009-11-06 | 1 | -0/+11 |
| | |\ \ | |||||
| | | * \ | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -0/+11 |
| | | |\ \ | |||||
| | * | | | | Speed up of test suite: | Michael Widenius | 2009-10-28 | 1 | -0/+4 |
| | |/ / / | |||||
| | * | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -0/+108 |
| | |\ \ \ | |||||
| | * \ \ \ | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -2/+81 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria. | Guilhem Bichot | 2009-03-11 | 1 | -0/+14 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 1 | -6/+19 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -3/+20 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -0/+13 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2007-12-16 | 1 | -2/+12 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | * tests which use MERGE or INSERT DELAYED should run only | unknown | 2007-08-09 | 1 | -0/+11 |
| * | | | | | | | | | | | WL#5370 Keep forward-compatibility when changing | unknown | 2010-08-18 | 1 | -1/+1 |
| * | | | | | | | | | | | A fix and a test case for Bug#36171 "CREATE TEMPORARY TABLE and | Konstantin Osipov | 2010-07-02 | 1 | -5/+330 |
| * | | | | | | | | | | | merge from mysql-trunk-bugfixing | Jon Olav Hauglid | 2010-06-30 | 1 | -10/+34 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Backport of revid:ingo.struewing@sun.com-20091223200354-r2uzbdkj2v6yv111 | Alexander Nozdrin | 2010-06-25 | 1 | -10/+34 |
| * | | | | | | | | | | | | A fix for Bug#54811 "Assert in mysql_lock_have_duplicate()". | Konstantin Osipov | 2010-06-29 | 1 | -0/+119 |
| |/ / / / / / / / / / / | |||||
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |