Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update FSF Address | Vicențiu Ciorbaru | 2019-05-11 | 1 | -1/+1 |
* | MDEV-4010 Deadlock on concurrent INSERT .. SELECT into an Aria table with sta... | Michael Widenius | 2014-12-15 | 1 | -7/+9 |
* | 5.3 merge | Sergei Golubchik | 2012-03-28 | 1 | -0/+3 |
|\ | |||||
| * | Fixed lp:963603 "Assertion `lock_type != TL_UNLOCK && (lock_type == TL_IGNORE... | Michael Widenius | 2012-03-26 | 1 | -0/+3 |
* | | merge 5.5 | Vladislav Vaintroub | 2012-02-27 | 1 | -12/+31 |
|\ \ | |||||
| * \ | 5.3 merge | Sergei Golubchik | 2012-02-24 | 1 | -12/+31 |
| |\ \ | | |/ | |||||
| | * | Fixed lp:933719, "Assertion open_tables == 0 ... " in THD::restore_backup_ope... | Michael Widenius | 2012-02-23 | 1 | -11/+30 |
* | | | address second round review comments | Vladislav Vaintroub | 2012-02-16 | 1 | -3/+1 |
* | | | merge | Vladislav Vaintroub | 2012-01-24 | 1 | -3/+4 |
|\ \ \ | |/ / | |||||
| * | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -3/+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 |
| | | | |\ | |||||
| | * | | | | Patch to get MariaDB to compile on CYGWIN; By Guenter Knauf | Michael Widenius | 2011-12-02 | 1 | -2/+2 |
| * | | | | | Fix compile error | Vladislav Vaintroub | 2011-12-27 | 1 | -1/+1 |
| * | | | | | Fixed lp:909051 Options --debug and --disable-debug are known but ambiguous i... | Michael Widenius | 2011-12-27 | 1 | -1/+1 |
* | | | | | | MDEV-82 : Fix place in thr_lock.c where wait-end callback was called without ... | Vladislav Vaintroub | 2012-01-10 | 1 | -1/+7 |
|/ / / / / | |||||
* | | | | | 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 | -42/+87 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Merge with 5.2 to get bug fixes for thr_lock | Michael Widenius | 2011-06-06 | 1 | -42/+70 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Fixed lock sorting and lock check issues with thr_lock that caused warnings w... | Michael Widenius | 2011-06-06 | 1 | -42/+70 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -2/+6 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Fixed bugs found by buildbot: | Michael Widenius | 2011-01-26 | 1 | -2/+6 |
| * | | | | | Merge with 5.1 | Michael Widenius | 2011-01-11 | 1 | -6/+4 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Fixed typo that caused compile failure in thr_lock.c | Michael Widenius | 2010-12-13 | 1 | -1/+1 |
| | * | | | | Better warning message if lock test fails | Michael Widenius | 2010-12-10 | 1 | -6/+4 |
| * | | | | | Implementation of MWL#172: Add support for prepared statements to HANDLER READ | Michael Widenius | 2011-01-04 | 1 | -3/+8 |
| |/ / / / | |||||
* | | | | | post-merge fixes. | Sergei Golubchik | 2011-07-02 | 1 | -1/+1 |
* | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -13/+0 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Remove configuration preprocessor symbols 'THREAD' | Magne Mahre | 2011-01-11 | 1 | -13/+0 |
* | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -18/+8 |
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -119/+194 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | Fixed compiler & valgrind warnings from my previous push. | Michael Widenius | 2010-11-03 | 1 | -0/+1 |
| * | | | Fix for: LP #634955: Assert in _ma_update_at_original_place() | Michael Widenius | 2010-11-02 | 1 | -58/+149 |
| * | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -2/+1 |
| |\ \ \ | | |/ / | |||||
| * | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -0/+22 |
| |\ \ \ | |||||
| * \ \ \ | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria. | Guilhem Bichot | 2009-03-11 | 1 | -3/+6 |
| |\ \ \ \ | |||||
| * | | | | | Fix for Bug#40311 Assert in MARIA_RECORD_POS during pushbuild 2 test: | Michael Widenius | 2008-12-22 | 1 | -1/+2 |
| * | | | | | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2008-05-29 | 1 | -32/+70 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Added versioning of row data | unknown | 2008-04-10 | 1 | -32/+70 |
| * | | | | | | | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gca | unknown | 2008-02-18 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2007-12-16 | 1 | -13/+7 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-09-27 | 1 | -13/+7 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2007-07-07 | 1 | -13/+7 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | in mysql_unlock_tables(), do thr_unlock() AFTER external_unlock(). | unknown | 2007-07-04 | 1 | -13/+7 |