summaryrefslogtreecommitdiff
path: root/sql/lock.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
|/ /
* | 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
|\ \ | |/
| * Merge from 5.0 for 43414Staale Smedseng2009-08-281-2/+1
| |\
| | * Bug #43414 Parenthesis (and other) warnings compiling MySQLStaale Smedseng2009-08-281-2/+1
| | * Merge 5.0.80 release and 5.0 community. Version left at 5.0.80.Chad MILLER2009-04-141-2/+2
| | |\
| | * \ Merge from 5.0 trunk.Chad MILLER2008-07-141-1/+1
| | |\ \
| | * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-09-101-4/+4
| | |\ \ \
| | | * \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2007-07-021-4/+4
| | | |\ \ \
| | | | * \ \ Merge mysqldev@production.mysql.com:my/mysql-5.0-releaseunknown2007-04-261-4/+4
| | | | |\ \ \
* | | | | \ \ \ Merged with mysql-5.1 tree.Michael Widenius2009-04-251-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-131-2/+2
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-101-2/+2
| | | |_|_|_|/ | | |/| | | |
| | * | | | | fixed warnings from the fix of 26243unknown2008-03-291-1/+1
| | |/ / / /
* | | | | | Merge with base MySQL 5.1Michael Widenius2009-02-151-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Added "Sun Microsystems, Inc." to copyright headers on files modifiedBuild Team2008-11-101-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
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Bug#34306: Can't make copy of log tables when server binary log is enabledDavi Arnaut2008-09-291-1/+1
* | | | | | Merged 5.1 with maria 5.1Michael Widenius2008-10-101-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Fix for bug #35732: read-only blocks SELECT statements in InnoDBunknown2008-04-081-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
| | | |\ \ \ \ \
| | | | * | | | | in mysql_unlock_tables(), do thr_unlock() AFTER external_unlock().unknown2007-07-041-2/+2
* | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maintunknown2007-12-201-3/+17
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Bug#30273 - merge tables: Can't lock file (errno: 155)unknown2007-12-111-3/+17
| |/ / / / / / /
* | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-forcollapseandmergeunknown2007-12-141-116/+103
|\ \ \ \ \ \ \ \
| * | | | | | | | Doxygenization of comments.unknown2007-10-111-116/+103
| |/ / / / / / /
* | | | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-comeng-unificationunknown2007-10-171-64/+264
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge moksha.local:/Users/davi/mysql/push/bugs/25164-5.0unknown2007-08-271-0/+2
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | Bug#25164 create table `a` as select * from `A` hangsunknown2007-08-271-0/+2
| | * | | | | | Bug#29936 (Stored Procedure DML ignores low_priority_updates setting)unknown2007-08-161-0/+1
| * | | | | | | Bug#29936 (Stored Procedure DML ignores low_priority_updates setting)unknown2007-08-171-0/+1
| * | | | | | | Provide initial module structure to Doxygen.unknown2007-08-151-1/+8
| * | | | | | | Fix doxygen warnings.unknown2007-08-151-4/+9
| * | | | | | | Don't save & restore time fields from thd when it's not needed.unknown2007-08-021-0/+4