Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | MDEV-254: Server hang with FLUSH TABLES WITH READ LOCK AND DISABLE CHECKPOINT | unknown | 2012-05-08 | 1 | -0/+9 |
* | Cleanups: | Michael Widenius | 2012-03-20 | 1 | -1/+1 |
* | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -5/+9 |
|\ | |||||
| * | Merge with 5.1 & fixes to IGNORE handling | Michael Widenius | 2011-12-11 | 1 | -2/+4 |
| |\ | |||||
| | * | 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 |
| | | | |\ | |||||
| * | | | | | BUG#868908: Crash in check_simple_equality() with semijoin + materialization ... | Sergey Petrunya | 2011-12-07 | 1 | -3/+7 |
| |/ / / / | |||||
* | | | | | Fix crash due to wrong my_error() call (5.5 after-merge fix). | unknown | 2011-12-05 | 1 | -1/+1 |
* | | | | | 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 |
| | |\ \ \ \ | |||||
| | | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
* | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -60/+65 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Added option "AND DISABLE CHECKPOINT" to "FLUSH TABLES WITH READ LOCK" | Michael Widenius | 2011-04-28 | 1 | -1/+27 |
| * | | | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -1/+2 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -0/+3 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | * | | | | Fixed bugs found by buildbot: | Michael Widenius | 2011-01-26 | 1 | -0/+3 |
| | * | | | | | Merge with alias as String | Michael Widenius | 2011-02-28 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | | * | | | | Change TABLE->alias to String for less memory reallocation | Michael Widenius | 2011-02-28 | 1 | -1/+1 |
| * | | | | | | Merge with 5.1 | Michael Widenius | 2011-01-11 | 1 | -2/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| * | | | | | | Implementation of MWL#172: Add support for prepared statements to HANDLER READ | Michael Widenius | 2011-01-04 | 1 | -148/+156 |
| * | | | | | | Merge with 5.1-release. | Michael Widenius | 2010-12-06 | 1 | -5/+3 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge with MySQL 5.1.53 | Michael Widenius | 2010-11-25 | 1 | -5/+3 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | / / | | | | |/ / | | | |/| | | |||||
| | | * | | | Bug#45288: pb2 returns a lot of compilation warnings | Davi Arnaut | 2010-10-20 | 1 | -5/+3 |
| * | | | | | Code cleanup to get fewer reallocs() during execution. | Michael Widenius | 2010-11-24 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -304/+59 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Patch that refactors global read lock implementation and fixes | Dmitry Lenev | 2010-11-11 | 1 | -303/+59 |
| * | | | | Bug#37780: Make KILL reliable (main.kill fails randomly) | Davi Arnaut | 2010-10-22 | 1 | -14/+13 |
* | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -24/+10 |
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -31/+74 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | Fix for: LP #634955: Assert in _ma_update_at_original_place() | Michael Widenius | 2010-11-02 | 1 | -29/+74 |
| * | | | When one does a drop table, the indexes are not flushed to disk before drop a... | Michael Widenius | 2010-02-10 | 1 | -1/+5 |
| * | | | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -2/+1 |
| |\ \ \ | | |/ / | |||||
| * | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -2/+2 |
| |\ \ \ | |||||
| * \ \ \ | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -0/+1 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1 | unknown | 2007-12-27 | 1 | -4/+4 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | 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 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | Fixed several bugs found by running *.test with maria engine | unknown | 2007-09-03 | 1 | -2/+2 |
| | | | * | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2007-07-07 | 1 | -2/+2 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | | * | | | | | | | in mysql_unlock_tables(), do thr_unlock() AFTER external_unlock(). | unknown | 2007-07-04 | 1 | -2/+2 |
* | | | | | | | | | | | | Commit on behalf of Dmitry Lenev. | Konstantin Osipov | 2010-08-12 | 1 | -17/+9 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Fix for bug #52044 "FLUSH TABLES WITH READ LOCK and FLUSH | Dmitry Lenev | 2010-07-27 | 1 | -17/+9 |
* | | | | | | | | | | | | | Implement WL#5502 Remove dead 5.0 class Sensitive_cursor. | Konstantin Osipov | 2010-07-27 | 1 | -1/+1 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | merge from mysql-trunk-bugfixing | Jon Olav Hauglid | 2010-07-13 | 1 | -6/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabled | Davi Arnaut | 2010-07-08 | 1 | -6/+6 |
* | | | | | | | | | | | | | A 5.5 version of the fix for Bug #54360 "Deadlock DROP/ALTER/CREATE | Jon Olav Hauglid | 2010-07-01 | 1 | -39/+28 |