Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/10.1' into 10.2 | Alexander Barkov | 2019-09-24 | 1 | -1/+1 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/5.5' into 10.1 | Alexander Barkov | 2019-09-24 | 1 | -1/+1 |
| |\ | |||||
| | * | Fix spelling mistakes in MyISAM code comments | Ian Gilfillan | 2019-09-20 | 1 | -1/+1 |
* | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-05-13 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | Update FSF Address | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
* | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2018-01-03 | 1 | -7/+7 |
|\ \ \ | |/ / | |||||
| * | | Merge 10.0 into 10.1 | Marko Mäkelä | 2018-01-03 | 1 | -7/+7 |
| |\ \ | |||||
| | * \ | Merge 5.5 into 10.0 | Marko Mäkelä | 2018-01-03 | 1 | -7/+7 |
| | |\ \ | | | |/ | |||||
| | | * | Silence some -Wimplicit-fallthrough by proper spelling | Marko Mäkelä | 2018-01-03 | 1 | -7/+7 |
* | | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT. | Vladislav Vaintroub | 2017-09-28 | 1 | -25/+25 |
|/ / / | |||||
* | | | MDEV-6650 - LINT_INIT emits code in non-debug builds | Sergey Vojtovich | 2015-03-16 | 1 | -2/+1 |
|/ / | |||||
* | | MDEV-5314 - Compiling fails on OSX using clang | Sergey Vojtovich | 2014-02-19 | 1 | -2/+2 |
|/ | |||||
* | merge with mysql-5.5.30 minus few incorrect or not applicable changesets | Sergei Golubchik | 2013-02-28 | 1 | -6/+9 |
|\ | |||||
| * | Bug#13556000: CHECK AND REPAIR TABLE SHOULD BE MORE ROBUST[2] | Venkata Sidagam | 2012-11-09 | 1 | -6/+9 |
* | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+2 |
|\ \ | |||||
| * \ | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+4 |
| |\ \ | |||||
| | * \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+4 |
| | |\ \ | |||||
| | | * \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+4 |
| | | |\ \ | |||||
* | | | \ \ | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+2 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
* | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -1/+4 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Fix for lp:711565 "Index Condition Pushdown can make a thread hold MyISAM loc... | Michael Widenius | 2011-02-18 | 1 | -1/+4 |
| | |_|/ / | |/| | | | |||||
| * | | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -7/+3 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Merge with MySQL 5.1.52 | Michael Widenius | 2010-11-23 | 1 | -7/+3 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -9/+10 |
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | |||||
| * | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -3/+3 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -3/+3 |
| | |\ \ | |||||
| * | | | | Applied Antony T Curtis patch for declaring many CHARSET objects as const | Michael Widenius | 2010-01-06 | 1 | -2/+3 |
| |/ / / | |||||
| * | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -4/+2 |
| |\ \ \ | |||||
| * \ \ \ | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -5/+10 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Fixed problems in merge | Michael Widenius | 2009-05-19 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | We are now using Valgrind rather than purify, and have for quite some time. | unknown | 2009-05-06 | 1 | -1/+1 |
| * | | | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | merge | Sergei Golubchik | 2008-08-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Fix for bug#38484 DELETE causes crash or index corruption | Michael Widenius | 2008-08-24 | 1 | -1/+1 |
| * | | | | | | | wt: comments, OOM checks, test case for deadlock detection | Sergei Golubchik | 2008-08-28 | 1 | -3/+3 |
| |/ / / / / / | |||||
| * | | | | | | Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gca | unknown | 2008-02-18 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Fixed compiler warnings | unknown | 2008-01-13 | 1 | -1/+1 |
| * | | | | | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-09-27 | 1 | -5/+5 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 | unknown | 2007-06-27 | 1 | -5/+5 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-maria | unknown | 2007-02-28 | 1 | -5/+5 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-2 | unknown | 2006-08-09 | 1 | -5/+5 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ | Merge sanja.is.com.ua:/home/bell/mysql/bk/work-5.1 | unknown | 2006-05-24 | 1 | -5/+5 |
| | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | * | | | | | | | Added storage/maria (based on MyISAM). WL#3245 | unknown | 2006-04-11 | 1 | -5/+5 |
* | | | | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-5.5-merge. | Davi Arnaut | 2010-09-24 | 1 | -7/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-09-24 | 1 | -7/+3 |
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
* | | | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-07-02 | 1 | -4/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-07-02 | 1 | -3/+3 |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |