mariadb/storage/innobase
Marko Mäkelä 514144276f Merge a change from mysql-5.1-innodb:
------------------------------------------------------------
  revno: 3488
  revision-id: marko.makela@oracle.com-20100601103738-upm8awahesmeh9dr
  parent: vasil.dimov@oracle.com-20100531163540-9fu3prbn2asqwdi5
  committer: Marko Mäkelä <marko.makela@oracle.com>
  branch nick: 5.1-innodb
  timestamp: Tue 2010-06-01 13:37:38 +0300
  message:
    Bug#53812: assert row/row0umod.c line 660 in txn rollback after crash recovery
    row_undo_mod_upd_exist_sec(): Tolerate a failure to build the index entry
    for a DYNAMIC or COMPRESSED table during crash recovery.
2010-06-01 15:05:01 +03:00
..
btr Fix Bug #53947 InnoDB: Assertion failure in thread 4224 in file .\sync\sync0sync.c line 324 2010-05-31 18:23:41 +03:00
buf Merge from mysql-5.1-innodb: 2010-06-01 14:56:22 +03:00
data Merge r3403..3414 from mysql-5.1-innodb: 2010-04-22 14:24:42 +03:00
dict Merge mysql-trunk-innodb from bk-internal into my local tree 2010-05-27 15:07:08 +03:00
dyn Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
eval Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
fil Merge a change from mysql-5.1-innodb: 2010-05-24 14:45:24 +03:00
fsp Merge from mysql-5.1-innodb: 2010-05-04 16:57:09 +03:00
fut Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
ha Merge from innodb-branches-innodb+ (2) 2010-04-19 20:53:16 +03:00
handler Fix an assertion failure with UNIV_DEBUG is set. Initialize a 2010-05-27 04:15:54 -07:00
ibuf Merge from innodb-branches-innodb+ (2) 2010-04-19 20:53:16 +03:00
include Fix coding style 2010-05-31 13:59:23 +03:00
lock Check in patch for bug #53336, Improved InnoDB Transaction Reporting. 2010-05-12 08:39:45 -07:00
log Fix bug#53499 - purge thread is active during shutdown, assert buf/buf0buf.c line 4115. 2010-05-10 13:17:17 +10:00
mach Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
mem Fix bug #52546, crash on shutdown of plugin with innodb_use_sys_malloc=0. 2010-05-17 01:57:42 -07:00
mtr Merge from innodb-branches-innodb+ (2) 2010-04-19 20:53:16 +03:00
mysql-test/patches Move InnoDB tests from storage/innobase/mysql-test/ (where they were ignored) 2010-04-14 14:14:48 +03:00
os Add two debug assertions and a comment to make it clear that 2010-05-27 20:30:08 +03:00
page Merge a change from mysql-5.1-innodb: 2010-05-19 12:36:27 +03:00
pars Import branches/innodb+ from SVN on top of storage/innobase. 2010-04-12 18:20:41 +03:00
que Remove references to srv0que.h. 2010-05-12 12:20:26 +10:00
read Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
rem Merge from mysql-5.1-innodb: 2010-05-11 19:18:28 +03:00
row Merge a change from mysql-5.1-innodb: 2010-06-01 15:05:01 +03:00
srv Fix bug #52546, crash on shutdown of plugin with innodb_use_sys_malloc=0. 2010-05-17 01:57:42 -07:00
sync Fix the printout for long semaphore waits to not 2010-05-27 12:53:39 -04:00
thr Import branches/innodb+ from SVN on top of storage/innobase. 2010-04-12 18:20:41 +03:00
trx Merge mysql-trunk-innodb from bk-internal into my local branch 2010-05-14 16:44:14 +03:00
usr Merge Innodb Plugin 1.0.6 from mysql-5.1-bugteam storage/innodb_plugin to mysql-trunk-merge. 2009-12-02 19:30:50 +05:30
ut Merge from innodb-branches-innodb+ (2) 2010-04-19 20:53:16 +03:00
CMakeLists.txt Clean up CMake file by removing duplicate entry for Windows. 2010-05-07 15:37:34 -05:00
compile-innodb Update compile-innodb to use cmake and remove the debug version. 2010-04-15 12:33:07 +03:00
COPYING Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
COPYING.Google Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
COPYING.Percona Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
COPYING.Sun_Microsystems Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
Doxyfile Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
ha_innodb.def Renamed storage/innodb_plugin to storage/innobase, so that 1) it's the same 2009-08-07 12:16:00 +02:00
Makefile.am Merge mysql-trunk-bugfixing -> mysql-trunk-innodb 2010-05-19 23:48:50 +03:00
plug.in Import branches/innodb+ from SVN on top of storage/innobase. 2010-04-12 18:20:41 +03:00