summaryrefslogtreecommitdiff
path: root/mysys/thr_lock.c
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| | * Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | |\
| | | * Updated/added copyright headersKent Boortz2011-06-301-2/+3
* | | | Fixed lock sorting and lock check issues with thr_lock that caused warnings w...Michael Widenius2011-06-061-42/+70
|/ / /
* | | Fixed bugs found by buildbot:Michael Widenius2011-01-261-2/+6
* | | 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
* | | 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
|\ \ \ | |/ /
| * | Bug#53445: Build with -Wall and fix warnings that it generatesDavi Arnaut2010-07-021-2/+1
* | | Merge with MySQL 5.1, with following additions:unknown2009-11-161-0/+22
|\ \ \ | |/ /
| * | WL#4259 - Debug Sync FacilityIngo Struewing2009-09-291-0/+22
* | | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.Guilhem Bichot2009-03-111-3/+6
|\ \ \ | |/ /
| * | Bug#40536: SELECT is blocked by INSERT DELAYED waiting onDavi Arnaut2009-02-031-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 Bug#36579 into mysql-5.1-bugteamDavi Arnaut2008-08-251-1/+1
| |\ \ | | |/
| | * Bug#36579 Dumping information about locks in use may lead to a server crashDavi Arnaut2008-08-251-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 gbichot@bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2008-02-181-3/+3
| |\ \
| * | | Bug#30331 Table_locks_waited shows inaccurate valuesunknown2008-01-281-1/+2
* | | | Merge gbichot4.local:/home/mysql_src/mysql-5.1-build-gcaunknown2008-02-181-3/+3
|\ \ \ \ | | |/ / | |/| |
| * | | Fix for server bug experienced in Maria (wrong "Truncated incorrect <var_name>unknown2008-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
* | | | | Bug#26379 - Combination of FLUSH TABLE and REPAIR TABLEunknown2007-11-151-10/+23
|/ / / /
* | | | Merge mockturtle.local:/home/dlenev/src/mysql-5.0-bg21281unknown2007-08-051-8/+32
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Fix for bug #21281 "Pending write lock is incorrectly removed when itsunknown2007-08-051-8/+32
| * | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-mainunknown2007-03-281-1/+1
| |\ \
| | * | Fixed compiler warnings.unknown2007-03-221-7/+8
* | | | WL#3817: Simplify string / memory area types and make things more consistent ...unknown2007-05-101-2/+2
| |_|/ |/| |
* | | Fixed compiler warningsunknown2007-02-231-8/+21
* | | Merge mysql.com:/home/svoj/devel/mysql/merge/mysql-5.0-enginesunknown2006-12-301-2/+10
|\ \ \ | |/ /
| * | Merge mysql.com:/home/svoj/devel/mysql/BUG23526/mysql-5.0-engines2unknown2006-12-301-2/+10
| |\ \
| | * | BUG#23526 - show table status reports incorrect values for MyISAM tablesunknown2006-12-051-2/+10
* | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0unknown2006-12-231-2/+1
|\ \ \ \ | |/ / /
| * | | Many files:unknown2006-12-231-2/+1
| |/ /
* | | Merge mysql.com:/home/my/mysql-5.0unknown2006-11-221-7/+8
|\ \ \ | |/ /
| * | Remove compiler warningsunknown2006-11-201-7/+8
* | | thr_alarm.c, thr_lock.c, my_global.h:unknown2006-10-121-1/+1
* | | Merge mysql.com:/home/mydev/mysql-5.0-tmp_mergeunknown2006-07-041-0/+2
|\ \ \ | |/ /
| * | Bug#16986 - Deadlock condition with MyISAM tablesunknown2006-06-261-0/+2
* | | Remove compiler warningsunknown2006-06-231-2/+5
* | | This changeset is largely a handler cleanup changeset (WL#3281), but includes...unknown2006-06-041-7/+7