summaryrefslogtreecommitdiff
path: root/mysys/thr_lock.c
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | |\ \ \ \
| | | * | | | Updated/added copyright headersKent Boortz2011-06-301-2/+3
* | | | | | | merge with 5.3Sergei Golubchik2011-10-191-42/+87
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Merge with 5.2 to get bug fixes for thr_lockMichael Widenius2011-06-061-42/+70
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Fixed lock sorting and lock check issues with thr_lock that caused warnings w...Michael Widenius2011-06-061-42/+70
| | | |_|_|/ | | |/| | |
| * | | | | Merge with 5.2Michael Widenius2011-03-091-2/+6
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fixed bugs found by buildbot:Michael Widenius2011-01-261-2/+6
| * | | | | Merge with 5.1Michael Widenius2011-01-111-6/+4
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fixed typo that caused compile failure in thr_lock.cMichael Widenius2010-12-131-1/+1
| | * | | | Better warning message if lock test failsMichael Widenius2010-12-101-6/+4
| * | | | | Implementation of MWL#172: Add support for prepared statements to HANDLER READMichael Widenius2011-01-041-3/+8
| |/ / / /
* | | | | post-merge fixes.Sergei Golubchik2011-07-021-1/+1
* | | | | 5.5-mergeSergei Golubchik2011-07-021-13/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Remove configuration preprocessor symbols 'THREAD'Magne Mahre2011-01-111-13/+0
* | | | | lots of post-merge changesSergei Golubchik2011-04-251-18/+8
* | | | | merge.Sergei Golubchik2010-11-251-119/+194
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Fixed compiler & valgrind warnings from my previous push.Michael Widenius2010-11-031-0/+1
| * | | Fix for: LP #634955: Assert in _ma_update_at_original_place()Michael Widenius2010-11-021-58/+149
| * | | Merge with MySQL 5.1.50Michael Widenius2010-08-271-2/+1
| |\ \ \ | | |/ /
| * | | Merge with MySQL 5.1, with following additions:unknown2009-11-161-0/+22
| |\ \ \
| * \ \ \ merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.Guilhem Bichot2009-03-111-3/+6
| |\ \ \ \
| * | | | | Fix for Bug#40311 Assert in MARIA_RECORD_POS during pushbuild 2 test:Michael Widenius2008-12-221-1/+2
| * | | | | Merged 5.1 with maria 5.1Michael Widenius2008-10-101-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-mariaunknown2008-05-291-32/+70
| |\ \ \ \ \ \
| | * | | | | | Added versioning of row dataunknown2008-04-101-32/+70
| * | | | | | | Merge mysql.com:/home/my/mysql-5.1unknown2008-04-281-1/+2
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gcaunknown2008-02-181-3/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-12-161-13/+7
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-09-271-13/+7
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-mariaunknown2007-07-071-13/+7
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | in mysql_unlock_tables(), do thr_unlock() AFTER external_unlock().unknown2007-07-041-13/+7
* | | | | | | | | | | | Auto-merge from mysql-5.5-merge.Alexander Nozdrin2010-08-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Part of fix for bug#52044 "FLUSH TABLES WITH READ LOCK andDmitry Lenev2010-08-061-1/+1
View Lorry Controller Status