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 my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
db Added Innobase to source distribution 2001-02-17 14:19:19 +02:00
dict Apply innodb-5.0-ss1372 snapshot 2007-03-28 22:41:21 -06:00
dyn my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
eval my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
fil Merge mysql.com:/home/kent/bk/tmp2/mysql-4.1-build 2007-01-11 12:43:30 +01:00
fsp NULL MERGE this ChangeSet to 5.1 2007-08-15 17:20:54 -06:00
fut my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
ha Merge mysql.com:/home/kent/bk/tmp2/mysql-4.1-build 2007-01-11 12:43:30 +01:00
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 my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
mem my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
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 my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
pars my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
que my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
read my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
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 my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
thr Merge mysql.com:/home/kent/bk/tmp2/mysql-4.1-build 2007-01-11 12:43:30 +01:00
trx NULL MERGE this ChangeSet to 5.1 2007-08-15 17:20:54 -06:00
usr my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00
ut NULL MERGE this to 5.1 2007-03-22 14:40:52 -06:00
CMakeLists.txt Bug#25765 too many dbg heap assertions on windows 2007-03-20 10:07:23 -04:00
configure.in Apply innodb-5.0-ss1405 snapshot 2007-04-18 19:36:22 -06:00
Makefile.am my_strtoll10-x86.s: 2006-12-31 01:02:27 +01:00