lp:~stewart/drizzle/update-innobase-1.0.11

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

2215. By Stewart Smith on 2010-11-16

merge trunk

2214. By jimmy on 2010-11-11

Merge Revision revid:<email address hidden> from MySQL InnoDB

Original revid:<email address hidden>

Original Authors: Jimmy Yang <email address hidden>
Original commit message:
Fix bug #55581 by backporting fix of #52546 from mysql-trunk-innodb
to mysql-5.1-innodb plugin.

2213. By Vasil Dimov on 2010-11-11

Merge Revision revid:<email address hidden> from MySQL InnoDB

Original revid:<email address hidden>

Original Authors: Vasil Dimov <email address hidden>
Original commit message:
Increment InnoDB Plugin version to 1.0.11.
InnoDB Plugin 1.0.10 has been released with MySQL 5.1.49.

2212. By jimmy on 2010-11-11

Merge Revision revid:<email address hidden> from MySQL InnoDB

Original revid:<email address hidden>

Original Authors: Jimmy Yang <email address hidden>
Original commit message:
Add innodb_bug53756-master.opt for innodb_bug53756 test.

2211. By jimmy on 2010-11-11

Merge Revision revid:<email address hidden> from MySQL InnoDB

Original revid:<email address hidden>

Original Authors: Jimmy Yang <email address hidden>
Original commit message:
Port fix for bug #54311 from mysql-trunk-innodb to mysql-5.1-innodb codeline.
Bug #54311: Crash on CHECK PARTITION after concurrent LOAD DATA
and adaptive_hash_index=OFF

2210. By Marko Mäkelä <email address hidden> on 2010-11-11

Merge Revision revid:<email address hidden> from MySQL InnoDB

Original revid:<email address hidden>

Original Authors: Marko Mäkelä <email address hidden>
Original commit message:
Bug#54358 follow-up: Correct some error handling.

2209. By Marko Mäkelä <email address hidden> on 2010-11-11

Merge Revision revid:<email address hidden> from MySQL InnoDB

Original revid:<email address hidden>

Original Authors: Marko Mäkelä <email address hidden>
Original commit message:
Correct some comments that were added in the fix of Bug #54358
(READ UNCOMMITTED access failure of off-page DYNAMIC or COMPRESSED columns).

Records that lack incompletely written externally stored columns may
be accessed by READ UNCOMMITTED transaction even without involving a
crash during an INSERT or UPDATE operation. I verified this as follows.

(1) added a delay after the mini-transaction for writing the clustered
index 'stub' record was committed (patch attached)
(2) started mysqld in gdb, setting breakpoints to the where the
assertions about READ UNCOMMITTED were added in the bug fix
(3) invoked ibtest3 --create-options=key_block_size=2
to create BLOBs in a COMPRESSED table
(4) invoked the following:
yes 'set transaction isolation level read uncommitted;
checksum table blobt3;select sleep(1);'|mysql -uroot test
(5) noted that one of the breakpoints was triggered
(return(NULL) in btr_rec_copy_externally_stored_field())

=== modified file 'storage/innodb_plugin/row/row0ins.c'
--- storage/innodb_plugin/row/row0ins.c 2010-06-30 08:17:25 +0000
+++ storage/innodb_plugin/row/row0ins.c 2010-06-30 08:17:25 +0000
@@ -2120,6 +2120,7 @@ function_exit:
   rec_t* rec;
   ulint* offsets;
   mtr_start(&mtr);
+ os_thread_sleep(5000000);

   btr_cur_search_to_nth_level(index, 0, entry, PAGE_CUR_LE,
          BTR_MODIFY_TREE, &cursor, 0,

=== modified file 'storage/innodb_plugin/row/row0upd.c'
--- storage/innodb_plugin/row/row0upd.c 2010-06-30 08:11:55 +0000
+++ storage/innodb_plugin/row/row0upd.c 2010-06-30 08:11:55 +0000
@@ -1763,6 +1763,7 @@ row_upd_clust_rec(
   rec_offs_init(offsets_);

   mtr_start(mtr);
+ os_thread_sleep(5000000);

   ut_a(btr_pcur_restore_position(BTR_MODIFY_TREE, pcur, mtr));
   rec = btr_cur_get_rec(btr_cur);

2208. By Marko Mäkelä <email address hidden> on 2010-11-11

Merge Revision revid:<email address hidden> from MySQL InnoDB

Original revid:<email address hidden>

Original Authors: Marko Mäkelä <email address hidden>
Original commit message:
ChangeLog entry for Bug #54408

2207. By Marko Mäkelä <email address hidden> on 2010-11-11

Merge Revision revid:<email address hidden> from MySQL InnoDB

Original revid:<email address hidden>

Original Authors: Marko Mäkelä <email address hidden>
Original commit message:
Bug#54408: txn rollback after recovery: row0umod.c:673
dict_table_get_format(index->table)

The REDUNDANT and COMPACT formats store a local 768-byte prefix of
each externally stored column. No row_ext cache is needed, but we
initialized one nevertheless. When the BLOB pointer was zero, we would
ignore the locally stored prefix as well. This triggered an assertion
failure in row_undo_mod_upd_exist_sec().

row_build(): Allow ext==NULL when a REDUNDANT or COMPACT table
contains externally stored columns.

row_undo_search_clust_to_pcur(), row_upd_store_row(): Invoke
row_build() with ext==NULL on REDUNDANT and COMPACT tables.

rb://382 approved by Jimmy Yang

2206. By Marko Mäkelä <email address hidden> on 2010-11-11

Merge Revision revid:<email address hidden> from MySQL InnoDB

Original revid:<email address hidden>

Original Authors: Marko Mäkelä <email address hidden>
Original commit message:
ChangeLog entry for Bug #54358