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 |
| * | | Remove unused declarations | Marko Mäkelä | 2019-04-03 | 1 | -11/+0 |
* | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT. | Vladislav Vaintroub | 2017-09-28 | 1 | -22/+22 |
* | | | MDEV-10804 main.stat_tables_par fails sporadically in buildbot | Michael Widenius | 2017-05-11 | 1 | -1/+2 |
* | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 1 | -5/+5 |
|\ \ \ | |/ / | |||||
| * | | spelling fixes | klemens | 2017-03-07 | 1 | -5/+5 |
* | | | fix build and some warnings | kevg | 2016-11-24 | 1 | -12/+0 |
* | | | Reuse THD for new user connections | Monty | 2016-06-04 | 1 | -3/+4 |
* | | | MDEV-6150 Speed up connection speed by moving creation of THD to new thread | Monty | 2016-02-07 | 1 | -12/+14 |
|/ / | |||||
* | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-09-03 | 1 | -5/+7 |
|\ \ | |||||
| * | | MDEV-8399 - [PATCH] Missing Sanity Checks for memory allocation in MariaDB | Sergey Vojtovich | 2015-07-23 | 1 | -5/+7 |
* | | | - Renaming variables so that they don't shadow others (After this patch one c... | Monty | 2015-07-06 | 1 | -4/+2 |
* | | | Merge branch '10.0' into merge-wip | Sergei Golubchik | 2015-01-31 | 1 | -8/+11 |
|\ \ \ | |/ / | |||||
| * | | 5.5 merge | Sergei Golubchik | 2015-01-21 | 1 | -7/+9 |
| |\ \ | | |/ | |||||
| | * | MDEV-4010 Deadlock on concurrent INSERT .. SELECT into an Aria table with sta... | Michael Widenius | 2014-12-15 | 1 | -7/+9 |
| * | | Fixed MDEV-7314: Deadlock when doing insert-select with Aria | Michael Widenius | 2015-01-18 | 1 | -1/+2 |
* | | | cleanup: galera misc cleanups | Sergei Golubchik | 2014-10-10 | 1 | -4/+4 |
* | | | compiler warnings | Sergei Golubchik | 2014-10-01 | 1 | -3/+0 |
* | | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-26 | 1 | -0/+128 |
|/ / | |||||
* | | fixes for test failures | Sergei Golubchik | 2012-09-27 | 1 | -7/+16 |
|/ | |||||
* | 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 |
| |/ / / / |