Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/10.1' into 10.2 | Alexander Barkov | 2019-09-24 | 1 | -2/+2 |
|\ | |||||
| * | Merge remote-tracking branch 'origin/5.5' into 10.1 | Alexander Barkov | 2019-09-24 | 1 | -2/+2 |
| |\ | |||||
| | * | Fix spelling mistakes in MyISAM code comments | Ian Gilfillan | 2019-09-20 | 1 | -2/+2 |
* | | | 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 |
* | | | MDEV-17070 Table corruption or Assertion `table->file->stats.records > 0 || e... | Sergei Golubchik | 2019-03-12 | 1 | -1/+3 |
* | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-10-24 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-10-18 | 1 | -1/+1 |
| |\ \ | | |/ | |||||
| | * | MDEV-13459 Warnings, when compiling with gcc-7.x | Sergei Golubchik | 2017-10-17 | 1 | -1/+2 |
| * | | Silence bogus GCC 7 warnings -Wimplicit-fallthrough | Marko Mäkelä | 2017-05-17 | 1 | -1/+2 |
* | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-22 | 1 | -1/+2 |
|\ \ \ | |||||
| * | | | Silence bogus GCC 7 warnings -Wimplicit-fallthrough | Marko Mäkelä | 2017-05-17 | 1 | -1/+2 |
| |/ / | |||||
* | | | MDEV-10216: Assertion `strcmp(share->unique_file_name,filename) || | Nirbhay Choubey | 2016-08-08 | 1 | -0/+1 |
|/ / | |||||
* | | MDEV-5314 - Compiling fails on OSX using clang | Sergey Vojtovich | 2014-02-19 | 1 | -2/+2 |
* | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -1/+1 |
|/ | |||||
* | MDEV-419 ensure that all HAVE_XXX constants can be set by cmake | Sergei Golubchik | 2012-07-31 | 1 | -2/+0 |
* | 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 | -0/+5 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Fix for lp:711565 "Index Condition Pushdown can make a thread hold MyISAM loc... | Michael Widenius | 2011-02-18 | 1 | -0/+5 |
* | | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -1/+1 |
* | | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -9/+39 |
|\ \ \ \ \ \ | |/ / / / / | | / / / / | |/ / / / |/| | | | | |||||
| * | | | | Automerge with 5.2 | Michael Widenius | 2010-11-05 | 1 | -0/+5 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Automatic merge with 5.1 | Michael Widenius | 2010-11-04 | 1 | -0/+5 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | Fix for: LP #634955: Assert in _ma_update_at_original_place() | Michael Widenius | 2010-11-02 | 1 | -0/+5 |
| * | | | | MariaDB 5.2 -> MariaDB 5.3 merge | Sergey Petrunya | 2010-06-26 | 1 | -6/+3 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -5/+0 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -5/+0 |
| | | |\ \ | | | | |/ | |||||
| | * | | | WL#86: Partitioned key cache for MyISAM. | Igor Babaev | 2010-02-16 | 1 | -1/+3 |
| | |/ / | |||||
| * | | | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 1 | -1/+6 |
| |\ \ \ | | |/ / | |||||
| | * | | When one does a drop table, the indexes are not flushed to disk before drop a... | Michael Widenius | 2010-02-10 | 1 | -1/+6 |
| * | | | Backport into MariaDB-5.2 the following: | Sergey Petrunya | 2009-12-15 | 1 | -0/+6 |
| |/ / | |||||
| * | | Don't call _ma_decrement_open_count() for ma_extra(HA_EXTRA_PREPARE_FOR_DROP). | Michael Widenius | 2009-10-06 | 1 | -2/+12 |
| * | | Updated documentation files to reflect MariaDB and not the Maria storage engi... | Michael Widenius | 2009-09-03 | 1 | -3/+4 |
| * | | Fixed bug in undo_key_delete; Caused crashed key files in recovery | unknown | 2007-12-17 | 1 | -1/+1 |
| * | | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-09-27 | 1 | -3/+4 |
| |\ \ | |||||
| | * | | Fixed several bugs found by running *.test with maria engine | unknown | 2007-09-03 | 1 | -3/+4 |
* | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-04-03 | 1 | -5/+0 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | BUG#51868 - crash with myisam_use_mmap and partitioned | Sergey Vojtovich | 2010-03-22 | 1 | -5/+0 |
* | | | | WL#2360 Performance schema | Marc Alff | 2009-12-04 | 1 | -18/+18 |
|/ / / | |||||
* | | | Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1 | unknown | 2007-10-11 | 1 | -1/+1 |
|/ / | |||||
* | | Fixed a lot of compiler warnings and errors detected by Forte C++ on Solaris | unknown | 2007-08-13 | 1 | -3/+5 |
* | | Merge mysql.com:/home/svoj/devel/mysql/BUG29957/mysql-5.0-engines | unknown | 2007-07-27 | 1 | -1/+1 |
|/ | |||||
* | WL#3817: Simplify string / memory area types and make things more consistent ... | unknown | 2007-05-10 | 1 | -5/+5 |