| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 branch '10.1' into 10.2 | Sergei Golubchik | 2019-03-15 | 1 | -9/+10 |
|\ \ \
| |/ / |
|
| * | | fix gcc 8 compiler warnings | Sergei Golubchik | 2019-03-14 | 1 | -9/+10 |
* | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT. | Vladislav Vaintroub | 2017-09-28 | 1 | -7/+7 |
* | | | MDEV-8360 Clean-up CHARSET_INFO: strnncollsp: diff_if_only_endspace_difference | Alexander Barkov | 2016-03-31 | 1 | -1/+1 |
|/ / |
|
* | | MDEV-6650 - LINT_INIT emits code in non-debug builds | Sergey Vojtovich | 2015-03-16 | 1 | -5/+2 |
* | | 5.5 merge | Sergei Golubchik | 2014-02-25 | 1 | -2/+1 |
|\ \
| |/ |
|
| * | MySQL-5.5.36 merge | Sergei Golubchik | 2014-02-17 | 1 | -2/+1 |
| |\ |
|
| | * | Updated/added copyright headers | Murthy Narkedimilli | 2014-01-06 | 1 | -1/+1 |
* | | | bugfix: missing restore_record when modifying roles_mapping() table. | Sergei Golubchik | 2013-10-18 | 1 | -0/+4 |
* | | | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -4/+4 |
|\ \ \
| |/ / |
|
| * | | Fixed some cache variables that could be set to higher value than what the co... | Michael Widenius | 2013-06-06 | 1 | -4/+4 |
* | | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -3/+4 |
|\ \ \
| |/ / |
|
| * | | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 1 | -3/+4 |
| |\ \
| | |/ |
|
| | * | Bug#11758009 - UNION EXECUTION ORDER WRONG ? | Neeraj Bisht | 2013-01-15 | 1 | -5/+8 |
| | |\ |
|
| | | * | Bug#11758009 - UNION EXECUTION ORDER WRONG ? | Neeraj Bisht | 2013-01-15 | 1 | -5/+8 |
* | | | | cleanup: use MYF() for mysys flags | Sergei Golubchik | 2013-01-23 | 1 | -2/+2 |
* | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -3/+3 |
|/ / / |
|
* | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
|\ \ \ |
|
| * \ \ | Merge with MySQL 5.1.60 | Michael Widenius | 2011-11-23 | 1 | -1/+1 |
| |\ \ \
| | | |/
| | |/| |
|
| * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -3/+5 |
| |\ \ \ |
|
| * \ \ \ | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -0/+1 |
| |\ \ \ \ |
|
* | \ \ \ \ | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -3/+4 |
|\ \ \ \ \ \
| | |_|_|_|/
| |/| | | | |
|
| * | | | | | Merge. | Sergey Vojtovich | 2011-09-16 | 1 | -1/+1 |
| |\ \ \ \ \
| | | |_|_|/
| | |/| | | |
|
| | * | | | | BUG#11761180 - 53646: MYISAMPACK CORRUPTS TABLES WITH | Sergey Vojtovich | 2011-09-16 | 1 | -1/+1 |
| | | |_|/
| | |/| | |
|
| | * | | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -2/+3 |
| | |\ \ \ |
|
| * | \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-07-04 | 1 | -1/+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 |
* | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -4/+2 |
|\ \ \ \ \ \
| |/ / / / / |
|
| * | | | | | Auto-merge from mysql-5.1 | Ramil Kalimullin | 2011-06-07 | 1 | -1/+1 |
| |\ \ \ \ \
| | | |/ / /
| | |/| | | |
|
| | * | | | | Bug#11764487: myisam corruption with insert ignore and invalid spatial data | Ramil Kalimullin | 2011-06-07 | 1 | -1/+1 |
| | | |_|/
| | |/| | |
|
| | * | | | Bug#11900714 REMOVE LGPL LICENSED FILES IN MYSQL 5.1 | Magne Mahre | 2011-03-28 | 1 | -0/+1 |
| | |/ / |
|
| * | | | Remove configuration preprocessor symbols 'THREAD' | Magne Mahre | 2011-01-11 | 1 | -3/+1 |
* | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -15/+20 |
|\ \ \ \
| |/ / /
|/| | /
| | |/
| |/| |
|
| * | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -1/+1 |
| |\ \
| | |/ |
|
| * | | Fix some compiler warnings seen in Buildbot. | unknown | 2010-03-10 | 1 | -2/+5 |
| * | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -7/+7 |
| |\ \ |
|
| * \ \ | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -1/+8 |
| |\ \ \ |
|
| * | | | | Added versioning of Maria index | Michael Widenius | 2008-06-26 | 1 | -1/+1 |
| * | | | | Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gca | unknown | 2008-02-18 | 1 | -6/+6 |
| |\ \ \ \ |
|
| * \ \ \ \ | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-09-27 | 1 | -6/+6 |
| |\ \ \ \ \ |
|
| | * \ \ \ \ | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 | unknown | 2007-06-27 | 1 | -6/+6 |
| | |\ \ \ \ \ |
|
| | | * \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-maria | unknown | 2007-02-28 | 1 | -6/+6 |
| | | |\ \ \ \ \ |
|
| | | | * \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean | unknown | 2006-12-20 | 1 | -6/+6 |
| | | | |\ \ \ \ \ |
|
| | | | | * \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean | unknown | 2006-10-10 | 1 | -6/+6 |
| | | | | |\ \ \ \ \ |
|
| | | | | | * \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-maria | unknown | 2006-09-07 | 1 | -6/+6 |
| | | | | | |\ \ \ \ \ |
|
| | | | | | | * \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-2 | unknown | 2006-08-09 | 1 | -6/+6 |
| | | | | | | |\ \ \ \ \ |
|