mariadb/innobase
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
..
btr NULL MERGE UP to 5.1. 2007-07-10 08:16:51 -06:00
buf NULL MERGE UP to 5.1. 2007-07-10 08:16:51 -06:00
data
db
dict
dyn
eval
fil
fsp NULL MERGE this ChangeSet to 5.1 2007-08-15 17:20:54 -06:00
fut
ha
ibuf NULL MERGE UP to 5.1. 2007-07-10 08:16:51 -06:00
include NULL MERGE this ChangeSet to 5.1 2007-08-15 17:20:54 -06:00
lock NULL MERGE UP to 5.1. 2007-07-10 08:16:51 -06:00
log NULL MERGE this ChangeSet to 5.1 2007-08-15 17:20:54 -06:00
mach
mem
mtr NULL MERGE UP to 5.1. 2007-07-10 08:16:51 -06:00
os NULL MERGE this ChangeSet to 5.1 2007-08-15 17:20:54 -06:00
page
pars
que
read
rem NULL MERGE UP to 5.1. 2007-07-10 08:16:51 -06:00
row NULL MERGE UP to 5.1. 2007-07-10 08:16:51 -06:00
srv NULL MERGE this ChangeSet to 5.1 2007-08-15 17:20:54 -06:00
sync
thr
trx NULL MERGE this ChangeSet to 5.1 2007-08-15 17:20:54 -06:00
usr
ut
CMakeLists.txt
configure.in
Makefile.am