Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.2' into 10.3 | Sergei Golubchik | 2018-03-28 | 1 | -3/+1 |
|\ | |||||
| * | After-merge fix for commit 98eb9518db1da854048b09d94244a982a1d32f9a | Marko Mäkelä | 2018-03-16 | 1 | -3/+1 |
* | | Fix that end_bulk_insert() doesn't write to to-be-deleted files | Monty | 2017-05-17 | 1 | -4/+4 |
|/ | |||||
* | 5.5.38 merge | Sergei Golubchik | 2014-06-06 | 1 | -2/+9 |
|\ | |||||
| * | MDEV-6245 Certain compressed tables with myisampack are corrupted by "CHECK T... | Michael Widenius | 2014-05-17 | 1 | -2/+9 |
* | | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 1 | -1/+1 |
|\ \ | |||||
| * \ | 5.5 merge | Sergei Golubchik | 2014-02-25 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | MySQL-5.5.36 merge | Sergei Golubchik | 2014-02-17 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Updated/added copyright headers | Murthy Narkedimilli | 2014-01-06 | 1 | -1/+1 |
* | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -3/+4 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -3/+4 |
* | | | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -1/+2 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 1 | -1/+2 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Bug#11757464:SERVER CRASH IN RECURSIVE CALL WHEN OOM | Nisha Gopalakrishnan | 2013-01-15 | 1 | -1/+2 |
* | | | | remove ULL() and LL(), because they're totally unnecessary | Sergei Golubchik | 2013-04-07 | 1 | -1/+2 |
| |_|/ |/| | | |||||
* | | | cleanup: use MYF() for mysys flags | Sergei Golubchik | 2013-01-23 | 1 | -1/+1 |
* | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -2/+2 |
|/ / | |||||
* | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+3 |
| |\ \ | |||||
| | * \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+3 |
| | |\ \ | |||||
* | | \ \ | 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/+3 |
* | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -1/+1 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -1/+1 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -1/+1 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| * | | | | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Added option BACKUP_ALL to mysqld --myisam-recover to also get a backup of th... | Michael Widenius | 2010-11-07 | 1 | -1/+1 |
* | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -1/+1 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge | Kent Boortz | 2010-12-29 | 1 | -1/+1 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Merge | Kent Boortz | 2010-12-29 | 1 | -1/+1 |
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -25/+17 |
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | |||||
| * | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 1 | -6/+6 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Fixed compiler warnings | Michael Widenius | 2010-08-04 | 1 | -2/+2 |
| | * | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -6/+6 |
| | |\ \ | | | |/ | |||||
| * | | | Improved speed of thr_alarm from O(N) to O(1). thr_alarm is used to handle ti... | Michael Widenius | 2010-07-16 | 1 | -22/+14 |
| |/ / | |||||
| * | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -1/+1 |
| |\ \ | |||||
| * \ \ | Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gca | unknown | 2008-02-18 | 1 | -2/+2 |
| |\ \ \ | |||||
| * \ \ \ | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2007-12-16 | 1 | -4/+4 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-09-27 | 1 | -4/+4 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 | unknown | 2007-06-27 | 1 | -4/+4 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Fixes after review of guilhem of block record patch | unknown | 2007-04-19 | 1 | -4/+4 |
* | | | | | | | | WL#5498: Remove dead and unused source code | Davi Arnaut | 2010-07-23 | 1 | -5/+4 |
* | | | | | | | | WL#5486: Remove code for unsupported platforms | Davi Arnaut | 2010-07-15 | 1 | -3/+0 |
* | | | | | | | | WL#5486: Remove code for unsupported platforms | Davi Arnaut | 2010-07-15 | 1 | -13/+1 |
* | | | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled | Davi Arnaut | 2010-07-08 | 1 | -19/+18 |
* | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-06-10 | 1 | -6/+6 |
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 1 | -6/+6 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | Auto-merge from mysql-next-mr-bugfixing. | Alexander Nozdrin | 2009-12-10 | 1 | -1/+3 |
|\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Auto-merge from mysql-next-mr. | Alexander Nozdrin | 2009-12-10 | 1 | -2/+46 |
| |\ \ \ \ \ \ \ |