summaryrefslogtreecommitdiff
path: root/sql/lock.cc
Commit message (Expand)AuthorAgeFilesLines
* 10.0-monty mergeSergei Golubchik2013-07-211-12/+12
|\
| * Fix test errors like:Sergey Petrunya2013-07-081-10/+8
| * ha_partition.cc and ha_partition.h are now completely mergedMichael Widenius2013-06-271-11/+12
| * Fixed some merge issues:Michael Widenius2013-06-181-1/+0
* | 10.0-base mergeSergei Golubchik2013-04-151-10/+8
|\ \ | |/ |/|
| * error messages: name the storage engine explicitly,Sergei Golubchik2013-04-091-10/+8
* | fixes for test failuresSergei Golubchik2012-09-271-5/+4
|/
* MDEV-254: Server hang with FLUSH TABLES WITH READ LOCK AND DISABLE CHECKPOINTunknown2012-05-081-0/+9
* Cleanups:Michael Widenius2012-03-201-1/+1
* 5.3 mergeSergei Golubchik2012-01-131-5/+9
|\
| * Merge with 5.1 & fixes to IGNORE handlingMichael Widenius2011-12-111-2/+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
| | | | |\
| * | | | | BUG#868908: Crash in check_simple_equality() with semijoin + materialization ...Sergey Petrunya2011-12-071-3/+7
| |/ / / /
* | | | | Fix crash due to wrong my_error() call (5.5 after-merge fix).unknown2011-12-051-1/+1
* | | | | 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-60/+65
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Added option "AND DISABLE CHECKPOINT" to "FLUSH TABLES WITH READ LOCK"Michael Widenius2011-04-281-1/+27
| * | | | | | Merge with 5.2Michael Widenius2011-03-091-1/+2
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-0/+3
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Fixed bugs found by buildbot:Michael Widenius2011-01-261-0/+3
| | * | | | | Merge with alias as StringMichael Widenius2011-02-281-1/+1
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Change TABLE->alias to String for less memory reallocationMichael Widenius2011-02-281-1/+1
| * | | | | | Merge with 5.1Michael Widenius2011-01-111-2/+1
| |\ \ \ \ \ \ | | |/ / / / /
| * | | | | | Implementation of MWL#172: Add support for prepared statements to HANDLER READMichael Widenius2011-01-041-148/+156
| * | | | | | Merge with 5.1-release.Michael Widenius2010-12-061-5/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge with MySQL 5.1.53Michael Widenius2010-11-251-5/+3
| | |\ \ \ \ \ | | | |/ / / / | | |/| | / / | | | | |/ / | | | |/| |
| | | * | | Bug#45288: pb2 returns a lot of compilation warningsDavi Arnaut2010-10-201-5/+3
| * | | | | Code cleanup to get fewer reallocs() during execution.Michael Widenius2010-11-241-1/+1
| |/ / / /
* | | | | 5.5-mergeSergei Golubchik2011-07-021-304/+59
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Patch that refactors global read lock implementation and fixesDmitry Lenev2010-11-111-303/+59
| * | | | Bug#37780: Make KILL reliable (main.kill fails randomly)Davi Arnaut2010-10-221-14/+13
* | | | | lots of post-merge changesSergei Golubchik2011-04-251-24/+10
* | | | | merge.Sergei Golubchik2010-11-251-31/+74
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Fix for: LP #634955: Assert in _ma_update_at_original_place()Michael Widenius2010-11-021-29/+74
| * | | When one does a drop table, the indexes are not flushed to disk before drop a...Michael Widenius2010-02-101-1/+5
| * | | Merge MySQL 5.1.39 into MariaDB 5.1.unknown2009-10-151-2/+1
| |\ \ \ | | |/ /
| * | | Merged with mysql-5.1 tree.Michael Widenius2009-04-251-2/+2
| |\ \ \
| * \ \ \ Merge with base MySQL 5.1Michael Widenius2009-02-151-1/+1
| |\ \ \ \
| * \ \ \ \ Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or...Guilhem Bichot2008-11-211-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merged 5.1 with maria 5.1Michael Widenius2008-10-101-0/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge janus.mylan:/usr/home/serg/Abk/mysql-5.1unknown2007-12-271-4/+4
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-12-161-4/+4
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-09-271-4/+4
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Fixed several bugs found by running *.test with maria engineunknown2007-09-031-2/+2
| | | | * | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-mariaunknown2007-07-071-2/+2
| | | | |\ \ \ \ \ \ \
View Lorry Controller Status