Another fix done for this:

------------------------------------------------------------
revno: 754
committer: Raghavendra D Prabhu <email address hidden>
branch nick: pxc56
timestamp: Wed 2014-03-19 02:59:01 +0530
message:
  Bug#1293624: Fix another issue with wsrep_log_conflicts.
  
  This time it is taking trx_sys->mutex in following stack:
  
  
  # 2014-03-17T16:51:33 [2733] #6  0x0000000000ce86c8 in trx_print_latched (f=0x7f8fd8612860, trx=0x7f8d60032cc8, max_query_len=3000) at /mnt/workspace/build-xtradb-cluster-binaries-56/BUILD_TYPE/debug/label_exp/ce
   ntos6-64/Percona-XtraDB-Cluster-5.6.15/storage/innobase/trx/trx0trx.cc:2072
   # 2014-03-17T16:51:33 [2733] #7  0x0000000000baea95 in wsrep_kill_victim (trx=0x7f8d60032cc8, lock=0x7f8d640cef00) at /mnt/workspace/build-xtradb-cluster-binaries-56/BUILD_TYPE/debug/label_exp/centos6-64/Percona-
   XtraDB-Cluster-5.6.15/storage/innobase/lock/lock0lock.cc:1648
   # 2014-03-17T16:51:33 [2733] #8  0x0000000000baec7c in lock_rec_other_has_conflicting (mode=2563, block=0x7f8e7d2e8e28, heap_no=1, trx=0x7f8d60032cc8) at /mnt/workspace/build-xtradb-cluster-binaries-56/BUILD_TYPE
   /debug/label_exp/centos6-64/Percona-XtraDB-Cluster-5.6.15/storage/innobase/lock/lock0lock.cc:1704
   # 2014-03-17T16:51:33 [2733] #9  0x0000000000bb9eb7 in lock_rec_insert_check_and_lock (flags=0, rec=0x7f8ead03c088 "\200", block=0x7f8e7d2e8e28, index=0x7f8d3c05a3e8, thr=0x7f8d3c06adb0, mtr=0x7f8fb876b130, inher
   it=0x7f8fb876b040) at /mnt/workspace/build-xtradb-cluster-binaries-56/BUILD_TYPE/debug/label_exp/centos6-64/Percona-XtraDB-Cluster-5.6.15/storage/innobase/lock/lock0lock.cc:6367
   # 2014-03-17T16:51:33 [2733] #10 0x0000000000d1d3bf in btr_cur_ins_lock_and_undo (flags=0, cursor=0x7f8fb876b600, entry=0x7f8d580727f8, thr=0x7f8d3c06adb0, mtr=0x7f8fb876b130, inherit=0x7f8fb876b040) at /mnt/work
   space/build-xtradb-cluster-binaries-56/BUILD_TYPE/debug/label_exp/centos6-64/Percona-XtraDB-Cluster-5.6.15/storage/innobase/btr/btr0cur.cc:1272
   # 2014-03-17T16:51:33 [2733] #11 0x0000000000d1dba4 in btr_cur_optimistic_insert (flags=0, cursor=0x7f8fb876b600, offsets=0x7f8fb876b698, heap=0x7f8fb876b110, entry=0x7f8d580727f8, rec=0x7f8fb876b690, big_rec=0x7
   f8fb876b688, n_ext=0, thr=0x7f8d3c06adb0, mtr=0x7f8fb876b130) at /mnt/workspace/build-xtradb-cluster-binaries-56/BUILD_TYPE/debug/label_exp/centos6-64/Percona-XtraDB-Cluster-5.6.15/storage/innobase/btr/btr0cur.cc
   :1510
   # 2014-03-17T16:51:33 [2733] #12 0x0000000000c46774 in row_ins_sec_index_entry_low (flags=0, mode=2, index=0x7f8d3c05a3e8, offsets_heap=0x7f8d600a2e00, heap=0x7f8d600a9330, entry=0x7f8d580727f8, trx_id=0, thr=0x7 f8d3c06adb0) at /mnt/workspace/build-xtradb-cluster-binaries-56/BUILD_TYPE/debug/label_exp/centos6-64/Percona-XtraDB-Cluster-5.6.15/storage/innobase/row/row0ins.cc:2812
   # 2014-03-17T16:51:33 [2733] #13 0x0000000000c46e47 in row_ins_sec_index_entry (index=0x7f8d3c05a3e8, entry=0x7f8d580727f8, thr=0x7f8d3c06adb0) at /mnt/workspace/build-xtradb-cluster-binaries-56/BUILD_TYPE/debug/ label_exp/centos6-64/Percona-XtraDB-Cluster-5.6.15/storage/innobase/row/row0ins.cc:2997
   # 2014-03-17T16:51:33 [2733] #14 0x0000000000c46f38 in row_ins_index_entry (index=0x7f8d3c05a3e8, entry=0x7f8d580727f8, thr=0x7f8d3c06adb0) at /mnt/workspace/build-xtradb-cluster-binaries-56/BUILD_TYPE/debug/labe l_exp/centos6-64/Percona-XtraDB-Cluster-5.6.15/storage/innobase/row/row0ins.cc:3032
   # 2014-03-17T16:51:33 [2733] #15 0x0000000000c47213 in row_ins_index_entry_step (node=0x7f8d3c06ab10, thr=0x7f8d3c06adb0) at /mnt/workspace/build-xtradb-cluster-binaries-56/BUILD_TYPE/debug/label_exp/centos6-64/P ercona-XtraDB-Cluster-5.6.15/storage/innobase/row/row0ins.cc:3107
   # 2014-03-17T16:51:33 [2733] #16 0x0000000000c4751e in row_ins (node=0x7f8d3c06ab10, thr=0x7f8d3c06adb0) at /mnt/workspace/build-xtradb-cluster-binaries-56/BUILD_TYPE/debug/label_exp/centos6-64/Percona-XtraDB-Clu ster-5.6.15/storage/innobase/row/row0ins.cc:3247
   # 2014-03-17T16:51:33 [2733] #17 0x0000000000c478a7 in row_ins_step (thr=0x7f8d3c06adb0) at /mnt/workspace/build-xtradb-cluster-binaries-56/BUILD_TYPE/debug/label_exp/centos6-64/Percona-XtraDB-Cluster-5.6.15/stor age/innobase/row/row0ins.cc:3372
   # 2014-03-17T16:51:33 [2733] #18 0x0000000000c5f34d in row_insert_for_mysql (mysql_rec=0x7f8d3c06ec60 "\357\241\002", prebuilt=0x7f8d3c06a348) at /mnt/workspace/build-xtradb-cluster-binaries-56/BUILD_TYPE/debug/l abel_exp/centos6-64/Percona-XtraDB-Cluster-5.6.15/storage/innobase/row/row0mysql.cc:1313
   # 2014-03-17T16:51:33 [2733] #19 0x0000000000b5a524 in ha_innobase::write_row (this=0x7f8d3c0662e0, record=0x7f8d3c06ec60 "\357\241\002") at /mnt/workspace/build-xtradb-cluster-binaries-56/BUILD_TYPE/debug/label_ exp/centos6-64/Percona-XtraDB-Cluster-5.6.15/storage/innobase/handler/ha_innodb.cc:7618
   # 2014-03-17T16:51:33 [2733] #20 0x000000000066d8c9 in handler::ha_write_row (this=0x7f8d3c0662e0, buf=0x7f8d3c06ec60 "\357\241\002") at /mnt/workspace/build-xtradb-cluster-binaries-56/BUILD_TYPE/debug/label_exp/ centos6-64/Percona-XtraDB-Cluster-5.6.15/sql/handler.cc:7588
   # 2014-03-17T16:51:33 [2733] #21 0x0000000000a629eb in Write_rows_log_event::write_row (this=0x7f8d60056980, rli=0x7f8d600a0170, overwrite=false) at /mnt/workspace/build-xtradb-cluster-binaries-56/BUILD_TYPE/debu g/label_exp/centos6-64/Percona-XtraDB-Cluster-5.6.15/sql/log_event.cc:12495
   # 2014-03-17T16:51:33 [2733] #22 0x0000000000a62b68 in Write_rows_log_event::do_exec_row (this=0x7f8d60056980, rli=0x7f8d600a0170) at /mnt/workspace/build-xtradb-cluster-binaries-56/BUILD_TYPE/debug/label_exp/cen tos6-64/Percona-XtraDB-Cluster-5.6.15/sql/log_event.cc:12684
   # 2014-03-17T16:51:33 [2733] #23 0x0000000000a5bf1e in Rows_log_event::do_apply_row (this=0x7f8d60056980, rli=0x7f8d600a0170) at /mnt/workspace/build-xtradb-cluster-binaries-56/BUILD_TYPE/debug/label_exp/centos6- 64/Percona-XtraDB-Cluster-5.6.15/sql/log_event.cc:10126
   # 2014-03-17T16:51:33 [2733] #24 0x0000000000a5edd7 in Rows_log_event::do_apply_event (this=0x7f8d60056980, rli=0x7f8d600a0170) at /mnt/workspace/build-xtradb-cluster-binaries-56/BUILD_TYPE/debug/label_exp/centos 6-64/Percona-XtraDB-Cluster-5.6.15/sql/log_event.cc:11247
   # 2014-03-17T16:51:33 [2733] #25 0x0000000000a49e00 in Log_event::apply_event (this=0x7f8d60056980, rli=0x7f8d600a0170) at /mnt/workspace/build-xtradb-cluster-binaries-56/BUILD_TYPE/debug/label_exp/centos6-64/Per cona-XtraDB-Cluster-5.6.15/sql/log_event.cc:3076
   # 2014-03-17T16:51:33 [2733] #26 0x000000000065571c in wsrep_apply_events (thd=0x12f34da0, events_buf=0x7f8fac136e37, buf_len=0) at /mnt/workspace/build-xtradb-cluster-binaries-56/BUILD_TYPE/debug/label_exp/cento s6-64/Percona-XtraDB-Cluster-5.6.15/sql/wsrep_applier.cc:150
   # 2014-03-17T16:51:33 [2733] #27 0x0000000000655c7c in wsrep_apply_cb (ctx=0x12f34da0, buf=0x7f8fac136e37, buf_len=243, flags=1, meta=0x7f8fb876e250) at /mnt/workspace/build-xtradb-cluster-binaries-56/BUILD_TYPE/ debug/label_exp/centos6-64/Percona-XtraDB-Cluster-5.6.15/sql/wsrep_applier.cc:226
   # 2014-03-17T16:51:33 [2733] #28 0x00007f8fd57cc211 in galera::TrxHandle::apply (this=0x7f8d60082be0, recv_ctx=0x12f34da0, apply_cb=0x655b29 <wsrep_apply_cb(void*, void const*, size_t, uint32_t, wsrep_trx_meta_t  const*)>, meta=...) at galera/src/trx_handle.cpp:304
   # 2014-03-17T16:51:33 [2733] #29 0x00007f8fd5805345 in apply_trx_ws (recv_ctx=0x12f34da0, apply_cb=0x655b29 <wsrep_apply_cb(void*, void const*, size_t, uint32_t, wsrep_trx_meta_t const*)>, commit_cb=0x656073 <wsr ep_commit_cb(void*, uint32_t, wsrep_trx_meta_t const*, wsrep_bool_t*, bool)>, trx=..., meta=...) at galera/src/replicator_smm.cpp:39
   # 2014-03-17T16:51:33 [2733] #30 0x00007f8fd5805c0e in galera::ReplicatorSMM::replay_trx (this=0x1e48390, trx=0x7f8d60082be0, trx_ctx=0x12f34da0) at galera/src/replicator_smm.cpp:848
   # 2014-03-17T16:51:33 [2733] #31 0x00007f8fd58177bc in galera_replay_trx (gh=<value optimized out>, trx_handle=<value optimized out>, recv_ctx=0x12f34da0) at galera/src/wsrep_provider.cpp:301
   # 2014-03-17T16:51:33 [2733] #32 0x0000000000656fba in wsrep_replay_transaction (thd=0x12f34da0) at /mnt/workspace/build-xtradb-cluster-binaries-56/BUILD_TYPE/debug/label_exp/centos6-64/Percona-XtraDB-Cluster-5.6 .15/sql/wsrep_thd.cc:230
   # 2014-03-17T16:51:33 [2733] #33 0x0000000000817a0c in wsrep_mysql_parse (thd=0x12f34da0, rawbuf=0x7f8d60004c50 " \342\202\001", length=200, parser_state=0x7f8fb876f770) at /mnt/workspace/build-xtradb-cluster-bin aries-56/BUILD_TYPE/debug/label_exp/centos6-64/Percona-XtraDB-Cluster-5.6.15/sql/sql_parse.cc:6954
   # 2014-03-17T16:51:33 [2733] #34 0x0000000000808979 in dispatch_command (command=COM_QUERY, thd=0x12f34da0, packet=0x12f39381 "REPLACE INTO `table1000_innodb_int` ( `col_int` ) SELECT `col_char_12_key` FROM `tabl e100_innodb_key_pk_parts_2_int` AS X  ORDER BY `col_char_12`,`col_char_12_key`,`col_int`,`col_int_key`,`pk` LIMIT 8", packet_length=200) at /mnt/workspace/build-xtradb-cluster-binaries-56/BUILD_TYPE/debug/label_e xp/centos6-64/Percona-XtraDB-Cluster-5.6.15/sql/sql_parse.cc:1630
   # 2014-03-17T16:51:33 [2733] #35 0x0000000000807203 in do_command (thd=0x12f34da0) at /mnt/workspace/build-xtradb-cluster-binaries-56/BUILD_TYPE/debug/label_exp/centos6-64/Percona-XtraDB-Cluster-5.6.15/sql/sql_pa rse.cc:1133
   # 2014-03-17T16:51:33 [2733] #36 0x00000000007cdccd in do_handle_one_connection (thd_arg=0x12f34da0) at /mnt/workspace/build-xtradb-cluster-binaries-56/BUILD_TYPE/debug/label_exp/centos6-64/Percona-XtraDB-Cluster -5.6.15/sql/sql_connect.cc:1557
   # 2014-03-17T16:51:33 [2733] #37 0x00000000007cd7b4 in handle_one_connection (arg=0x12f34da0) at /mnt/workspace/build-xtradb-cluster-binaries-56/BUILD_TYPE/debug/label_exp/centos6-64/Percona-XtraDB-Cluster-5.6.15 /sql/sql_connect.cc:1461
   # 2014-03-17T16:51:33 [2733] #38 0x00007f8fd9e10851 in start_thread () from /lib64/libpthread.so.0
   # 2014-03-17T16:51:33 [2733] #39 0x00007f8fd836d94d in clone () from /lib64/libc.so.6
diff:
=== modified file 'Percona-Server/storage/innobase/lock/lock0lock.cc'
--- Percona-Server/storage/innobase/lock/lock0lock.cc	2014-03-17 19:19:58 +0000
+++ Percona-Server/storage/innobase/lock/lock0lock.cc	2014-03-18 21:29:01 +0000
@@ -6364,6 +6364,8 @@
 	on the successor, which produced an unnecessary deadlock. */
 
 #ifdef WITH_WSREP
+        if (wsrep_log_conflicts)
+                mutex_enter(&trx_sys->mutex);
 	if ((c_lock = (lock_t *)lock_rec_other_has_conflicting(
 		    static_cast<enum lock_mode>(
 			    LOCK_X | LOCK_GAP | LOCK_INSERT_INTENTION),
@@ -6374,6 +6376,8 @@
 			    LOCK_X | LOCK_GAP | LOCK_INSERT_INTENTION),
 		    block, next_rec_heap_no, trx)) {
 #endif /* WITH_WSREP */
+                if (wsrep_log_conflicts)
+                        mutex_exit(&trx_sys->mutex);
 		/* Note that we may get DB_SUCCESS also here! */
 		trx_mutex_enter(trx);
 
@@ -6389,6 +6393,8 @@
 
 		trx_mutex_exit(trx);
 	} else {
+                if (wsrep_log_conflicts)
+                        mutex_exit(&trx_sys->mutex);
 		err = DB_SUCCESS;
 	}