#At file:///usr/local/devel/bzrroot/server/mysql-5.5-innodb/ based on revid:marko.makela@stripped
3318 Vasil Dimov 2011-02-10 [merge]
Merge mysql-5.1-innodb -> mysql-5.5-innodb
modified:
storage/innobase/include/sync0rw.ic
=== modified file 'storage/innobase/include/sync0rw.ic'
--- a/storage/innobase/include/sync0rw.ic revid:marko.makela@stripped
+++ b/storage/innobase/include/sync0rw.ic revid:vasil.dimov@stripped
@@ -280,6 +280,7 @@ rw_lock_set_writer_id_and_recursion_flag
local_thread = lock->writer_thread;
success = os_compare_and_swap_thread_id(
&lock->writer_thread, local_thread, curr_thread);
+ UNIV_MEM_VALID(&success, sizeof(success));
ut_a(success);
lock->recursive = recursive;
No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).
| Thread |
|---|
| • bzr commit into mysql-5.5-innodb branch (vasil.dimov:3318) | vasil.dimov | 10 Feb |