summaryrefslogtreecommitdiff
path: root/sql/lock.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.1 into 10.2Marko Mäkelä2019-05-131-1/+1
|\
| * Update FSF addressVicențiu Ciorbaru2019-05-111-1/+1
* | Merge 10.1 into 10.2Marko Mäkelä2018-11-061-16/+0
|\ \ | |/
| * Merge branch '10.0' into 10.1Sergei Golubchik2018-10-301-16/+0
| |\
| | * Remove unused code.Sergey Vojtovich2018-10-191-17/+0
| | * MDEV-8453 Alter table not returning engine errorsSergei Golubchik2017-08-011-34/+3
* | | register keyword c++17 warningEugene Kosov2018-04-241-2/+2
* | | Fix several truncation and formatting warnings.Vladislav Vaintroub2017-10-031-1/+1
* | | Merge 10.1 into 10.2Marko Mäkelä2017-05-221-0/+3
|\ \ \ | |/ /
| * | Merge 10.0 into 10.1Marko Mäkelä2017-05-191-0/+3
| |\ \ | | |/
| | * MDEV-12761 Error return from external_lock make the server crashSergei Golubchik2017-05-151-0/+3
* | | MDEV-11227 - mysqlimport -l doesn't issue UNLOCK TABLESSergey Vojtovich2016-12-211-7/+1
* | | cleanup: unused open_table_from_share() flagsSergei Golubchik2016-12-121-1/+0
* | | Merge branch '10.1' into 10.2Sergei Golubchik2016-09-091-7/+51
|\ \ \ | |/ /
| * | Merge branch '10.0-galera' into bb-10.1-sergNirbhay Choubey2016-08-251-7/+51
| |\ \
| | * | Refs MW-252sjaakola2016-08-211-3/+6
| | * | Refs: MW-252sjaakola2016-08-211-8/+11
| | * | Refs MW-252sjaakola2016-08-211-3/+3
| | * | Refs MW-252sjaakola2016-08-211-5/+1
| | * | Refs MW-252sjaakola2016-08-211-1/+40
| | * | Merge tag 'mariadb-10.0.22' into 10.0-galeraNirbhay Choubey2015-10-311-1/+0
| | |\ \ | | | |/
| | * | maria-10.0.16 mergeNirbhay Choubey2015-01-261-4/+5
| | |\ \
| | * \ \ bzr merge -rtag:mariadb-10.0.15 maria/10.0Nirbhay Choubey2014-12-051-1/+1
| | |\ \ \
| | * \ \ \ bzr merge -r4209 maria/10.0.Nirbhay Choubey2014-05-211-0/+3
| | |\ \ \ \
| | * \ \ \ \ Merging mariadb-10.0.10.Nirbhay Choubey2014-04-081-4/+1
| | |\ \ \ \ \
| | * | | | | | Merge fix.Jan Lindström2013-09-091-1/+8
| | * | | | | | Merge 10.0 to galera-10.0Jan Lindström2013-09-031-12/+12
| | |\ \ \ \ \ \
| | * | | | | | | Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-131-1/+45
* | | | | | | | | MDEV-8931: (server part of) session state trackingOleksandr Byelkin2016-08-311-0/+37
|/ / / / / / / /
* | | | | | | | 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
|\ \ \ | |/ / |/| |