Commit f887a28c authored by Vasil Dimov's avatar Vasil Dimov

Merge mysql-5.1-innodb -> mysql-5.5-innodb

parents 79d7a9bb b5c61ed1
...@@ -280,6 +280,7 @@ rw_lock_set_writer_id_and_recursion_flag( ...@@ -280,6 +280,7 @@ rw_lock_set_writer_id_and_recursion_flag(
local_thread = lock->writer_thread; local_thread = lock->writer_thread;
success = os_compare_and_swap_thread_id( success = os_compare_and_swap_thread_id(
&lock->writer_thread, local_thread, curr_thread); &lock->writer_thread, local_thread, curr_thread);
UNIV_MEM_VALID(&success, sizeof(success));
ut_a(success); ut_a(success);
lock->recursive = recursive; lock->recursive = recursive;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment