| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fixes for CREATE_OR_REPLACE | Michael Widenius | 2014-01-31 | 1 | -36/+36 |
| * | 10.0-base merge | Sergei Golubchik | 2013-12-16 | 1 | -0/+7 |
| |\ | |||||
| | * | 5.5 merge | Sergei Golubchik | 2013-12-15 | 1 | -0/+7 |
| | |\ | |||||
| | | * | 5.3 merge | Sergei Golubchik | 2013-12-13 | 1 | -0/+7 |
| | | |\ | |||||
| | | | * | 5.2 merge | Sergei Golubchik | 2013-12-02 | 1 | -0/+7 |
| | | | |\ | |||||
| | | | | * | MDEV-5266 MySQL:57657 - Temporary MERGE table with temporary underlying is br... | Sergei Golubchik | 2013-11-29 | 1 | -0/+7 |
| * | | | | | MDEV-5042 - Server crashes when accessing incorrect MERGE table from trigger | Sergey Vojtovich | 2013-10-14 | 1 | -0/+2 |
| * | | | | | MDEV-4879 - Merge test cases for new CREATE TEMPORARY TABLE privilege model | Sergey Vojtovich | 2013-09-20 | 1 | -0/+87 |
| * | | | | | more post-merge fixes: | Sergei Golubchik | 2013-07-21 | 1 | -12/+12 |
| |/ / / / | |||||
| * | | | | error messages: name the storage engine explicitly, | Sergei Golubchik | 2013-04-09 | 1 | -2/+2 |
| * | | | | discovery using sql CREATE TABLE statement | Sergei Golubchik | 2013-04-09 | 1 | -12/+12 |
| |/ / / | |||||
| * | | | 5.3 merge | Sergei Golubchik | 2013-03-27 | 1 | -25/+156 |
| |\ \ \ | |/ / | |||||
| | * | | MDEV-4277: Crash inside mi_killed_in_mariadb() with myisammrg | Sergey Petrunya | 2013-03-21 | 1 | -0/+130 |
| | * | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -0/+29 |
| | |\ \ | | |/ | |||||
| | | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -0/+29 |
| | | |\ | |||||
| | | | * | BUG#11763712 - 56458: KILLING A FLUSH TABLE FOR A MERGE/CHILD | Sergey Vojtovich | 2011-08-18 | 1 | -0/+29 |
| * | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-27 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Made the optimizer switch for index condition pushdown set to 'on' by default. | Igor Babaev | 2011-11-21 | 1 | -1/+1 |
| * | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -6/+40 |
| |\ \ \ \ | |||||
| | * | | | | Fix for bug #11754210 - "45777: CHECK TABLE DOESN'T | Dmitry Lenev | 2011-07-22 | 1 | -6/+40 |
| * | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -13/+1 |
| |\ \ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | | Set the default to be mrr=off,mrr_sort_keys=off: | Sergey Petrunya | 2011-07-08 | 1 | -1/+1 |
| | * | | | | Make EXPLAIN better at displaying MRR/BKA: | Sergey Petrunya | 2011-04-02 | 1 | -1/+1 |
| | * | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -0/+2 |
| | |\ \ \ \ | | | |/ / | | |/| | | |||||
| | | * | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -0/+2 |
| | | |\ \ \ | | | | |/ | | | |/| | |||||
| | | | * | | Bug#35333, "If Federated table can't connect to remote host, can't retrieve | Christopher Powers | 2010-11-29 | 1 | -0/+2 |
| | * | | | | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 1 | -0/+41 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | Merge with MySQL 5.1.52 | Michael Widenius | 2010-11-23 | 1 | -0/+41 |
| | | |\ \ \ | | | |/ / | |||||
| | | | * | | Bug#46339 - crash on REPAIR TABLE merge table USE_FRM | Ingo Struewing | 2010-04-26 | 1 | -0/+41 |
| * | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -2/+102 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | | Bug#35333, "If Federated table can't connect to remote host, can't retrieve | Christopher Powers | 2010-11-30 | 1 | -0/+2 |
| | * | | | | Bug #57002 Assert in upgrade_shared_lock_to_exclusive() | Jon Olav Hauglid | 2010-10-06 | 1 | -1/+14 |
| | * | | | | Bug #56494 Segfault in upgrade_shared_lock_to_exclusive() for | Jon Olav Hauglid | 2010-09-22 | 1 | -1/+87 |
| | * | | | | Fix for merge.test failures in mysql-5.5-runtime | Dmitry Lenev | 2010-09-16 | 1 | -28/+0 |
| | * | | | | Fix for bug #56251 "Deadlock with INSERT DELAYED and MERGE | Dmitry Lenev | 2010-09-15 | 1 | -0/+28 |
| | * | | | | 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 | -73/+69 |
| |\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| | * | | | Automerge with 5.2 | Michael Widenius | 2010-11-05 | 1 | -22/+68 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Fix for: LP #634955: Assert in _ma_update_at_original_place() | Michael Widenius | 2010-11-02 | 1 | -22/+68 |
| | * | | | MariaDB 5.2 -> MariaDB 5.3 merge | Sergey Petrunya | 2010-06-26 | 1 | -0/+79 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -0/+79 |
| | | |\ \ | | | |/ | |||||
| | * | | | Backport into MariaDB-5.2 the following: | Sergey Petrunya | 2009-12-15 | 1 | -1/+1 |
| | |/ / | |||||
| | * | | Merge Mysql 5.1.39 merge into MariaDB trunk | unknown | 2009-11-06 | 1 | -0/+12 |
| | |\ \ | |||||
| | | * \ | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -0/+12 |
| | | |\ \ | |||||
| | * | | | | Speed up of test suite: | Michael Widenius | 2009-10-28 | 1 | -50/+0 |
| | |/ / / | |||||
| | * | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -0/+92 |
| | |\ \ \ | |||||
| | * \ \ \ | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -1/+75 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria. | Guilhem Bichot | 2009-03-11 | 1 | -0/+11 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 1 | -6/+15 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -0/+16 |
| | |\ \ \ \ \ \ \ | |||||
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |