tsmith@ramayana.hindu.god 5e926bc120 NULL MERGE this ChangeSet to 5.1 ... Apply innodb-5.0-ss1696 snapshot Fixes: - Bug#20090: InnoDB: Error: trying to declare trx to enter InnoDB - Bug#23710: crash_commit_before fails if innodb_file_per_table=1 At InnoDB startup consider the case where log scan went beyond checkpoint_lsn as a crash and initiate crash recovery code path. - Bug#28781: InnoDB increments auto-increment value incorrectly with ON DUPLICATE KEY UPDATE We need to do some special AUTOINC handling for the following case: INSERT INTO t (c1,c2) VALUES(x,y) ON DUPLICATE KEY UPDATE ... We need to use the AUTOINC counter that was actually used by MySQL in the UPDATE statement, which can be different from the value used in the INSERT statement. - Bug#29097: fsp_get_available_space_in_free_extents() is capped at 4TB Fix by typecasting the variables before multiplying them, so that the result of the multiplication is of type "unsigned long long". - Bug#29155: Innodb "Parallel recovery" is not prevented Fix by enabling file locking on FreeBSD. It has been disabled because InnoDB has refused to start on FreeBSD & LinuxThreads, but now it starts just fine.		2007-08-15 17:20:54 -06:00
..
btr0btr.h
btr0btr.ic
btr0cur.h	Applied innodb-5.0-ss368 snapshot	2006-03-29 23:04:32 +04:00
btr0cur.ic	innodb r702	2006-08-18 14:16:11 +02:00
btr0pcur.h
btr0pcur.ic
btr0sea.h
btr0sea.ic	Fixed BUG#15653, BUG#16582.	2006-01-30 22:33:02 +03:00
btr0types.h
buf0buf.h	This ChangeSet must be null-merged to 5.1. Applied innodb-5.0-ss982, -ss998, -ss1003	2006-11-09 05:02:37 +01:00
buf0buf.ic	NULL MERGE UP to 5.1.	2007-07-10 08:16:51 -06:00
buf0flu.h
buf0flu.ic
buf0lru.h	NULL MERGE UP to 5.1.	2007-07-10 08:16:51 -06:00
buf0lru.ic
buf0rea.h
buf0types.h
data0data.h
data0data.ic
data0type.h	Applied innodb snapshot ss792 and ss854.	2006-09-20 13:00:49 -06:00
data0type.ic	Applied innodb snapshot ss792 and ss854.	2006-09-20 13:00:49 -06:00
data0types.h
db0err.h
dict0boot.h
dict0boot.ic
dict0crea.h	This ChangeSet must be null-merged to 5.1. Applied innodb-5.0-ss982, -ss998, -ss1003	2006-11-09 05:02:37 +01:00
dict0crea.ic
dict0dict.h	NULL MERGE UP to 5.1.	2007-07-10 08:16:51 -06:00
dict0dict.ic	NULL MERGE UP to 5.1.	2007-07-10 08:16:51 -06:00
dict0load.h	Fix BUG#12071: "Windows hang: 'Opening tables' or 'Waiting for	2005-12-12 21:06:59 +03:00
dict0load.ic
dict0mem.h	NULL MERGE UP to 5.1.	2007-07-10 08:16:51 -06:00
dict0mem.ic
dict0types.h
dyn0dyn.h
dyn0dyn.ic
eval0eval.h
eval0eval.ic
eval0proc.h
eval0proc.ic
fil0fil.h
fsp0fsp.h	NULL MERGE this ChangeSet to 5.1	2007-08-15 17:20:54 -06:00
fsp0fsp.ic
fut0fut.h
fut0fut.ic
fut0lst.h
fut0lst.ic
ha0ha.h	Applied innodb-5.0-ss368 snapshot	2006-03-29 23:04:32 +04:00
ha0ha.ic
hash0hash.h	Many files:	2007-01-11 12:31:52 +01:00
hash0hash.ic
ibuf0ibuf.h
ibuf0ibuf.ic
ibuf0types.h
lock0lock.h	Changes from the innodb-5.0-ss115 snapshot.	2006-01-16 14:32:43 +03:00
lock0lock.ic
lock0types.h
log0log.h
log0log.ic
log0recv.h
log0recv.ic
mach0data.h
mach0data.ic
Makefile.am	my_strtoll10-x86.s:	2006-12-31 01:02:27 +01:00
Makefile.i
mem0dbg.h
mem0dbg.ic
mem0mem.h
mem0mem.ic
mem0pool.h
mem0pool.ic
mtr0log.h
mtr0log.ic
mtr0mtr.h
mtr0mtr.ic
mtr0types.h
os0file.h	NULL MERGE UP to 5.1.	2007-07-10 08:16:51 -06:00
os0proc.h
os0proc.ic
os0sync.h
os0sync.ic
os0thread.h
os0thread.ic
page0cur.h
page0cur.ic
page0page.h
page0page.ic	Applied innodb-5.0-ss368 snapshot	2006-03-29 23:04:32 +04:00
page0types.h
pars0grm.h
pars0opt.h
pars0opt.ic
pars0pars.h
pars0pars.ic
pars0sym.h
pars0sym.ic
pars0types.h
que0que.h
que0que.ic
que0types.h
read0read.h
read0read.ic
read0types.h
rem0cmp.h	Fix BUG#12071: "Windows hang: 'Opening tables' or 'Waiting for	2005-12-12 21:06:59 +03:00
rem0cmp.ic
rem0rec.h
rem0rec.ic	NULL MERGE this to 5.1	2007-03-22 14:40:52 -06:00
rem0types.h
row0ins.h
row0ins.ic
row0mysql.h	Added innodb_rollback_on_timeout option to restore the 4.1	2006-12-19 16:57:51 -07:00
row0mysql.ic
row0purge.h
row0purge.ic
row0row.h
row0row.ic
row0sel.h
row0sel.ic
row0types.h
row0uins.h
row0uins.ic
row0umod.h
row0umod.ic
row0undo.h
row0undo.ic
row0upd.h
row0upd.ic
row0vers.h
row0vers.ic
srv0que.h
srv0srv.h	Applied patch recieved from Marko:	2006-01-18 15:20:56 +03:00
srv0srv.ic
srv0start.h
sync0arr.h	This ChangeSet must be null-merged to 5.1. Applied innodb-5.0-ss982, -ss998, -ss1003	2006-11-09 05:02:37 +01:00
sync0arr.ic
sync0rw.h	This ChangeSet must be null-merged to 5.1.	2006-12-18 18:41:38 -07:00
sync0rw.ic	This ChangeSet must be null-merged to 5.1. Applied innodb-5.0-ss982, -ss998, -ss1003	2006-11-09 05:02:37 +01:00
sync0sync.h	This ChangeSet must be null-merged to 5.1.	2006-12-18 18:41:38 -07:00
sync0sync.ic	NULL MERGE this to 5.1	2007-03-22 14:40:52 -06:00
sync0types.h
thr0loc.h
thr0loc.ic
trx0purge.h
trx0purge.ic
trx0rec.h
trx0rec.ic
trx0roll.h
trx0roll.ic
trx0rseg.h
trx0rseg.ic
trx0sys.h
trx0sys.ic
trx0trx.h	NULL MERGE UP to 5.1.	2007-07-10 08:16:51 -06:00
trx0trx.ic
trx0types.h
trx0undo.h
trx0undo.ic
trx0xa.h
univ.i	NULL MERGE this ChangeSet to 5.1	2007-08-15 17:20:54 -06:00
usr0sess.h
usr0sess.ic
usr0types.h
ut0byte.h
ut0byte.ic	Fixed compiler warnings (for linux and win32 and win64)	2007-02-22 16:59:57 +02:00
ut0dbg.h
ut0lst.h
ut0mem.h
ut0mem.ic
ut0rnd.h
ut0rnd.ic
ut0sort.h
ut0ut.h
ut0ut.ic	Fixed compiler warnings (for linux and win32 and win64)	2007-02-22 16:59:57 +02:00