summaryrefslogtreecommitdiff
path: root/sql/lock.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.0' into 10.1Sergei Golubchik2015-11-191-1/+0
|\
| * remove unneded #include's that had a dubious explanationSergei Golubchik2015-10-241-1/+0
* | MDEV-8453 Alter table not returning engine errorsSergei Golubchik2015-11-161-34/+3
* | - Renaming variables so that they don't shadow others (After this patch one c...Monty2015-07-061-2/+2
* | MDEV-7945 - THD::enter_stage() takes 0.48% in OLTP ROSergey Vojtovich2015-05-131-2/+2
* | Merge branch '10.0' into merge-wipSergei Golubchik2015-01-311-4/+5
|\ \ | |/
| * Return to original stage after mysql_lock_tablesMichael Widenius2015-01-181-4/+5
* | MDEV-7004 - Merge scalability fixes from 10.0-powerSergey Vojtovich2014-12-051-6/+14
* | MDEV-7004 - Merge scalability fixes from 10.0-powerSergey Vojtovich2014-12-051-16/+15
* | Merge branch '10.0' into bb-10.1-mergeSergei Golubchik2014-12-021-1/+1
|\ \ | |/
| * MDEV-5120 Test suite test maria-no-logging failsMichael Widenius2014-09-301-1/+1
* | MDEV-6247: Merge 10.0-galera to 10.1.Jan Lindström2014-08-261-0/+46
|/
* 5.5 mergeSergei Golubchik2014-05-091-0/+2
|\
| * Added new states to be able to better diagnose where server hangs.Michael Widenius2014-05-031-1/+1
* | Asserting correct database name lettercase inSergei Golubchik2014-05-011-0/+2
* | MDEV-5864 - Reduce usage of LOCK_open: TABLE_SHARE::tdc.free_tablesSergey Vojtovich2014-03-201-4/+1
* | 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
|\ \ \ \ \ | | |_|/ / | |/| | |