summaryrefslogtreecommitdiff
path: root/mysys/thr_lock.c
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.4 into 10.5Marko Mäkelä2021-05-031-127/+0
|\
| * MDEV-22227 Assertion `state_ == s_exec' failed in wsrep::client_state::start_...bb-10.4-MDEV-22227mkaruza2021-04-281-127/+0
* | Changes needed for ColumnStore and insert cacheMonty2020-06-141-14/+19
* | Fixed bug thr_lock_info_initMonty2020-05-231-1/+1
|/
* Merge 10.2 into 10.3Marko Mäkelä2019-05-141-1/+1
|\
| * Merge 10.1 into 10.2Marko Mäkelä2019-05-131-1/+1
| |\
| | * Merge branch '5.5' into 10.1Vicențiu Ciorbaru2019-05-111-1/+1
| | |\
| | | * Update FSF AddressVicențiu Ciorbaru2019-05-111-1/+1
| | * | Remove unused declarationsMarko Mäkelä2019-04-031-11/+0
* | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-10-041-22/+22
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-10-021-22/+22
| |\ \ \ \ | | |/ / /
| | * | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT.Vladislav Vaintroub2017-09-281-22/+22
* | | | | Added DBUG_ASSERT_AS_PRINTF compile flagMonty2017-08-241-1/+1
* | | | | Cleaned up output from thr_print_locksMonty2017-08-241-19/+23
|/ / / /
* | | | Merge tag 'mariadb-10.2.6' into bb-10.2-extAlexander Barkov2017-05-261-1/+2
|\ \ \ \ | |/ / /
| * | | MDEV-10804 main.stat_tables_par fails sporadically in buildbotMichael Widenius2017-05-111-1/+2
* | | | Make SEQUENCE working with replicationMonty2017-05-231-1/+2
|/ / /
* | | Merge branch '10.1' into 10.2Sergei Golubchik2017-03-301-5/+5
|\ \ \ | |/ /
| * | spelling fixesklemens2017-03-071-5/+5
* | | fix build and some warningskevg2016-11-241-12/+0
* | | Reuse THD for new user connectionsMonty2016-06-041-3/+4
* | | MDEV-6150 Speed up connection speed by moving creation of THD to new threadMonty2016-02-071-12/+14
|/ /
* | Merge branch '10.0' into 10.1Sergei Golubchik2015-09-031-5/+7
|\ \
| * | MDEV-8399 - [PATCH] Missing Sanity Checks for memory allocation in MariaDBSergey Vojtovich2015-07-231-5/+7
* | | - Renaming variables so that they don't shadow others (After this patch one c...Monty2015-07-061-4/+2
* | | Merge branch '10.0' into merge-wipSergei Golubchik2015-01-311-8/+11
|\ \ \ | |/ /
| * | 5.5 mergeSergei Golubchik2015-01-211-7/+9
| |\ \ | | |/
| | * MDEV-4010 Deadlock on concurrent INSERT .. SELECT into an Aria table with sta...Michael Widenius2014-12-151-7/+9
| * | Fixed MDEV-7314: Deadlock when doing insert-select with AriaMichael Widenius2015-01-181-1/+2
* | | cleanup: galera misc cleanupsSergei Golubchik2014-10-101-4/+4
* | | compiler warningsSergei Golubchik2014-10-011-3/+0
* | | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-261-0/+128
|/ /
* | fixes for test failuresSergei Golubchik2012-09-271-7/+16
|/
* 5.3 mergeSergei Golubchik2012-03-281-0/+3
|\
| * Fixed lp:963603 "Assertion `lock_type != TL_UNLOCK && (lock_type == TL_IGNORE...Michael Widenius2012-03-261-0/+3
* | merge 5.5Vladislav Vaintroub2012-02-271-12/+31
|\ \
| * \ 5.3 mergeSergei Golubchik2012-02-241-12/+31
| |\ \ | | |/
| | * Fixed lp:933719, "Assertion open_tables == 0 ... " in THD::restore_backup_ope...Michael Widenius2012-02-231-11/+30
* | | address second round review commentsVladislav Vaintroub2012-02-161-3/+1
* | | mergeVladislav Vaintroub2012-01-241-3/+4
|\ \ \ | |/ /
| * | 5.3 mergeSergei Golubchik2012-01-131-3/+4
| |\ \ | | |/
| | * Merge with 5.2.Michael Widenius2011-12-111-2/+4
| | |\
| | | * Merge with MariaDB 5.1Michael Widenius2011-11-241-2/+4
| | | |\
| | | | * Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-2/+4
| | | | |\
| | * | | | Patch to get MariaDB to compile on CYGWIN; By Guenter KnaufMichael Widenius2011-12-021-2/+2
| * | | | | Fix compile errorVladislav Vaintroub2011-12-271-1/+1
| * | | | | Fixed lp:909051 Options --debug and --disable-debug are known but ambiguous i...Michael Widenius2011-12-271-1/+1
* | | | | | MDEV-82 : Fix place in thr_lock.c where wait-end callback was called without ...Vladislav Vaintroub2012-01-101-1/+7
|/ / / / /
* | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-2/+2
|\ \ \ \ \
| * \ \ \ \ Updated/added copyright headersKent Boortz2011-06-301-2/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |