summaryrefslogtreecommitdiff
path: root/sql/ha_innodb.cc
Commit message (Expand)AuthorAgeFilesLines
* Applied InnoDB snapshot innodb-5.0-ss2095tsmith@ramayana.hindu.god2007-11-201-8/+37
* Merge mysql.com:/home/gluh/MySQL/Merge/5.0gluh@eagle.(none)2007-10-231-1/+1
|\
| * type conversions fixed to avoid warnings on Windowsholyfoot/hf@mysql.com/hfmain.(none)2007-10-231-1/+1
* | Bug #20358: InnoDB hang on the adaptive hash index latch in btr0sea.ctsmith@sita.local2007-10-021-0/+3
|/
* NULL MERGE this ChangeSet to 5.1tsmith@ramayana.hindu.god2007-08-151-5/+24
* ha_innodb.cc:evgen@moonbone.local2007-07-311-1/+2
* Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optevgen@moonbone.local2007-07-301-9/+3
|\
| * Bug#24989: The DEADLOCK error is improperly handled by InnoDB.evgen@moonbone.local2007-07-301-9/+3
* | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optgkodinov/kgeorge@magare.gmz2007-07-231-11/+0
|\ \
| * | Bug #29644: alter table hangs if records locked in share mode gkodinov/kgeorge@magare.gmz2007-07-201-11/+0
* | | NULL MERGE UP to 5.1.tsmith@sita.local2007-07-101-10/+29
|/ /
* | Allow multiple calls to mysql_server_end()monty@mysql.com/narttu.mysql.fi2007-06-201-1/+1
|/
* Merge bk@192.168.21.1:mysql-5.0holyfoot/hf@mysql.com/hfmain.(none)2007-04-291-0/+2
|\
| * Fixed bug #27650:gshchepa/uchum@gshchepa.loc2007-04-261-0/+2
* | Apply innodb-5.0-ss1405 snapshottsmith@siva.hindu.god2007-04-181-0/+14
|/
* NULL MERGE this to 5.1tsmith@siva.hindu.god2007-03-221-0/+9
* Polishing: use constants instead of magic numbers.anozdrin/alik@booka.opbmk2007-03-091-8/+8
* Fixed compiler warnings (for linux and win32 and win64)monty@mysql.com/narttu.mysql.fi2007-02-221-3/+6
* Many files:kent@mysql.com/kent-amd64.(none)2006-12-231-2/+1
* Added innodb_rollback_on_timeout option to restore the 4.1 tsmith/tim@siva.hindu.god2006-12-191-0/+7
* Merge mysql.com:/data0/mysqldev/my/mysql-5.0-releasedfischer/mysqldev@mysql.com/production.mysql.com2006-12-191-19/+29
|\
| * This ChangeSet must be null-merged to 5.1.tsmith/tim@siva.hindu.god2006-12-181-19/+29
* | Fixed portability issue in my_thr_init.c (was added in my last push)monty@mysql.com/narttu.mysql.fi2006-11-301-1/+0
* | Remove compiler warningsmonty@mysql.com/nosik.monty.fi2006-11-201-2/+2
|/
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.cornsilk.net2006-11-021-4/+5
|\
| * Apply InnoDB snapshot ss923tsmith/tim@siva.hindu.god2006-10-201-4/+5
* | Merge willster.(none):/home/stewart/Documents/MySQL/4.1/bug19914-mk2stewart@willster.(none)2006-10-161-3/+3
|\ \ | |/ |/|
| * BUG#19914 SELECT COUNT(*) sometimes returns MAX_INT on cluster tablesstewart@willster.(none)2006-08-101-3/+3
| * Applied innodb-4.1-ss29 snapshot.aivanov@mysql.com2006-05-151-0/+2
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.0cmiller@zippy.cornsilk.net2006-09-231-1/+2
|\ \
| * | Bug#20573acurtis/antony@xiphis.org/ltantony.xiphis.org2006-08-301-1/+2
* | | Applied innodb snapshot ss792 and ss854.tsmith/tim@siva.hindu.god2006-09-201-13/+0
|/ /
* | innodb r702tnurnberg@salvation.intern.azundris.com2006-08-181-19/+12
* | Applied innodb-5.0-ss677 snapshot.tsmith@maint1.mysql.com2006-08-011-17/+9
* | Applying patch from SergeyVelliot@mysql.com2006-06-201-0/+11
* | Applied innodb-5.0-ss547 snapshot.aivanov@mysql.com2006-05-151-0/+3
* | foo2grog@mysql.com[grog]2006-04-131-230/+1
* | foo1grog@mysql.com[grog]2006-04-131-139/+139
* | Applied innodb-5.0-ss398 snapshot.aivanov@mysql.com2006-04-011-2/+8
* | Applied innodb-5.0-ss368 snapshotaivanov@mysql.com2006-03-291-40/+48
* | Mergekent@mysql.com2006-03-181-2/+2
|\ \
| * | configure.in:kent@mysql.com2006-03-171-2/+2
* | | Merge mysql.com:/home/emurphy/src/mysql/bk-clean/mysql-4.1elliot@mysql.com2006-03-171-0/+7
|\ \ \ | |/ / |/| / | |/
| * BUG#18283 When InnoDB returns error 'lock table full', MySQL can writeelliot@mysql.com2006-03-171-0/+7
| * Changes from innodb-4.1-ss14 snapshotaivanov@mysql.com2006-01-151-13/+118
| * Fix BUG#12071: "Windows hang: 'Opening tables' or 'Waiting foraivanov@mysql.com2005-12-121-56/+53
* | Fixed: BUG#15653, BUG#16157, BUG#16229, BUG#16298, BUG#16387, BUG#16582.aivanov@mysql.com2006-01-311-23/+36
* | Applied patch recieved from Marko:aivanov@mysql.com2006-01-181-2/+2
* | Applied patch recieved from Marko:aivanov@mysql.com2006-01-181-3/+1
* | Restore fix for bug #15108 (by ramil) erroneously erasedaivanov@mysql.com2006-01-161-2/+2