Added the global env condition and simplified the tests

varundeepsaini · varundeepsaini · commit 67920e916ca1 · 2025-12-23T02:37:33.000+05:30
Signed-off-by: Varun Deep Saini &lt;varun.23bcs10048@ms.sst.scaler.com&gt;
diff --git a/mysql-test/suite/innodb/r/deadlock_session_info.result b/mysql-test/suite/innodb/r/deadlock_session_info.result
@@ -1,38 +1,47 @@
-CREATE TABLE t1 (
-id INT PRIMARY KEY,
-x INT
-) ENGINE=InnoDB;
-INSERT INTO t1 VALUES (1, 10), (2, 20);
-connect  con1,localhost,root,,;
-connect  con2,localhost,root,,;
+SET @saved_print_all_deadlocks = @@GLOBAL.innodb_print_all_deadlocks;
+SET GLOBAL innodb_print_all_deadlocks = ON;
+CREATE TABLE t (a INT PRIMARY KEY) ENGINE=InnoDB;
+INSERT INTO t VALUES (1), (2);
+connect con1,localhost,root,,;
+connect con2,localhost,root,,;
 connection con1;
 BEGIN;
-UPDATE t1 SET x = 100 WHERE id = 1;
+SELECT * FROM t WHERE a = 1 FOR UPDATE;
+a
+1
 connection con2;
 BEGIN;
-UPDATE t1 SET x = 200 WHERE id = 2;
-UPDATE t1 SET x = 201 WHERE id = 1;
+SELECT * FROM t WHERE a = 2 FOR UPDATE;
+a
+2
+SET DEBUG_SYNC = 'lock_wait_start SIGNAL con2_waiting';
+SELECT * FROM t WHERE a = 1 FOR UPDATE;
 connection con1;
-Per-session deadlock info is available
-Message contains TRANSACTION keyword
-ROLLBACK;
-connection con2;
-ROLLBACK;
-INSERT INTO t1 VALUES (3, 30), (4, 40);
-connection con1;
-BEGIN;
-UPDATE t1 SET x = 300 WHERE id = 3;
-connection con2;
-BEGIN;
-UPDATE t1 SET x = 400 WHERE id = 4;
-UPDATE t1 SET x = 401 WHERE id = 3;
-connection con1;
-Second deadlock shows new transaction info
-Second deadlock does not contain old info
+SET DEBUG_SYNC = 'now WAIT_FOR con2_waiting';
+SET debug_dbug = '+d,innodb_deadlock_victim_self';
+SELECT * FROM t WHERE a = 2 FOR UPDATE;
+ERROR 40001: Deadlock found when trying to get lock; try restarting transaction
+SHOW WARNINGS;
+Level	Code	Message
+Note	1213	TIMESTAMP 0x75be845156c0
+*** (1) TRANSACTION:
+TRANSACTION TRX_ID, ACTIVE 0 sec starting index read
+mysql tables in use 1, locked 1
+LOCK WAIT 3 lock struct(s), heap size 1144, 2 row lock(s)
+MariaDB thread id TID, OS thread handle 129461124159168, query id QID localhost root Statistics
+SELECT * FROM t WHERE a = 2 FOR UPDATE
+*** WAITING FOR THIS LOCK TO BE GRANTED:
+RECORD LOCKS space id 8 page no 3 n bits 320 index PRIMARY of table `test`.`t` trx id TRX_ID lock_mode X locks rec but not gap waiting
+Record lock,
+Error	1213	Deadlock found when trying to get lock; try restarting transaction
 ROLLBACK;
 connection con2;
+a
+1
 ROLLBACK;
+connection default;
 disconnect con1;
 disconnect con2;
-connection default;
-DROP TABLE t1;
+SET DEBUG_SYNC = 'RESET';
+DROP TABLE t;
+SET GLOBAL innodb_print_all_deadlocks = @saved_print_all_deadlocks;
diff --git a/mysql-test/suite/innodb/t/deadlock_session_info.test b/mysql-test/suite/innodb/t/deadlock_session_info.test
@@ -1,106 +1,48 @@
-#
-# Test per-session deadlock information via SHOW WARNINGS
-#
-
 --source include/have_innodb.inc
+--source include/have_debug.inc
+--source include/have_debug_sync.inc
 
-CREATE TABLE t1 (
-  id INT PRIMARY KEY,
-  x INT
-) ENGINE=InnoDB;
-
-INSERT INTO t1 VALUES (1, 10), (2, 20);
-
---connect (con1,localhost,root,,)
---connect (con2,localhost,root,,)
-
---connection con1
-BEGIN;
-UPDATE t1 SET x = 100 WHERE id = 1;
-
---connection con2
-BEGIN;
-UPDATE t1 SET x = 200 WHERE id = 2;
---send UPDATE t1 SET x = 201 WHERE id = 1
-
---connection con1
---disable_abort_on_error
 --disable_query_log
---disable_result_log
-UPDATE t1 SET x = 101 WHERE id = 2;
---enable_result_log
+call mtr.add_suppression("Transactions deadlock detected");
 --enable_query_log
---enable_abort_on_error
---let $errno= $mysql_errno
-if ($errno != 1213) {
-  --echo Expected ER_LOCK_DEADLOCK (1213), got $errno
-  --die
-}
-
---let $msg1= query_get_value(SHOW WARNINGS, Message, 1)
---let $msg2= query_get_value(SHOW WARNINGS, Message, 2)
---let $deadlock_info= `SELECT IF(LENGTH('$msg1') > LENGTH('$msg2'), '$msg1', '$msg2')`
 
-if (`SELECT LENGTH('$deadlock_info') > 100`) {
-  --echo Per-session deadlock info is available
-}
+SET @saved_print_all_deadlocks = @@GLOBAL.innodb_print_all_deadlocks;
+SET GLOBAL innodb_print_all_deadlocks = ON;
 
-if (`SELECT '$deadlock_info' LIKE '%TRANSACTION%'`) {
-  --echo Message contains TRANSACTION keyword
-}
+CREATE TABLE t (a INT PRIMARY KEY) ENGINE=InnoDB;
+INSERT INTO t VALUES (1), (2);
 
-ROLLBACK;
-
---connection con2
---reap
-ROLLBACK;
-
-# Second deadlock to verify info is cleared between transactions
-INSERT INTO t1 VALUES (3, 30), (4, 40);
+--connect(con1,localhost,root,,)
+--connect(con2,localhost,root,,)
 
 --connection con1
 BEGIN;
-UPDATE t1 SET x = 300 WHERE id = 3;
+SELECT * FROM t WHERE a = 1 FOR UPDATE;
 
 --connection con2
 BEGIN;
-UPDATE t1 SET x = 400 WHERE id = 4;
---send UPDATE t1 SET x = 401 WHERE id = 3
+SELECT * FROM t WHERE a = 2 FOR UPDATE;
+SET DEBUG_SYNC = 'lock_wait_start SIGNAL con2_waiting';
+--send SELECT * FROM t WHERE a = 1 FOR UPDATE
 
 --connection con1
---disable_abort_on_error
---disable_query_log
---disable_result_log
-UPDATE t1 SET x = 301 WHERE id = 4;
---enable_result_log
---enable_query_log
---enable_abort_on_error
---let $errno= $mysql_errno
-if ($errno != 1213) {
-  --echo Expected ER_LOCK_DEADLOCK (1213), got $errno
-  --die
-}
-
---let $msg1= query_get_value(SHOW WARNINGS, Message, 1)
---let $msg2= query_get_value(SHOW WARNINGS, Message, 2)
---let $deadlock_info= `SELECT IF(LENGTH('$msg1') > LENGTH('$msg2'), '$msg1', '$msg2')`
-
-if (`SELECT '$deadlock_info' LIKE '%id = 3%' OR '$deadlock_info' LIKE '%id = 4%'`) {
-  --echo Second deadlock shows new transaction info
-}
+SET DEBUG_SYNC = 'now WAIT_FOR con2_waiting';
+SET debug_dbug = '+d,innodb_deadlock_victim_self';
+--error ER_LOCK_DEADLOCK
+SELECT * FROM t WHERE a = 2 FOR UPDATE;
 
-if (`SELECT '$deadlock_info' NOT LIKE '%id = 1%'`) {
-  --echo Second deadlock does not contain old info
-}
+--replace_regex /[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}/TIMESTAMP/ /thread id [0-9]+/thread id TID/ /query id [0-9]+/query id QID/ /trx id [0-9]+/trx id TRX_ID/ /TRANSACTION [0-9]+/TRANSACTION TRX_ID/
+SHOW WARNINGS;
 
 ROLLBACK;
 
 --connection con2
 --reap
 ROLLBACK;
 
+--connection default
 --disconnect con1
 --disconnect con2
---connection default
-
-DROP TABLE t1;
+SET DEBUG_SYNC = 'RESET';
+DROP TABLE t;
+SET GLOBAL innodb_print_all_deadlocks = @saved_print_all_deadlocks;
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
@@ -2104,17 +2104,8 @@ convert_error_code_to_mysql(
 		/* Since we rolled back the whole transaction, the
 		cached binlog must be emptied. */
 		innodb_transaction_abort(thd, true, error);
-		if (error == DB_DEADLOCK) {
-			trx_t* trx = thd_to_trx(thd);
-			if (trx && trx->lock.deadlock_info
-			    && trx->lock.deadlock_info_len > 0) {
-				push_warning_printf(thd,
-					Sql_condition::WARN_LEVEL_NOTE,
-					ER_LOCK_DEADLOCK,
-					"%s", trx->lock.deadlock_info);
-			}
+		if (error == DB_DEADLOCK)
 			return HA_ERR_LOCK_DEADLOCK;
-		}
 		return HA_ERR_RECORD_CHANGED;
 
 	case DB_LOCK_WAIT_TIMEOUT:
diff --git a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h
@@ -61,15 +61,6 @@ trx_set_detailed_error_from_file(
 	trx_t*	trx,	/*!< in: transaction struct */
 	FILE*	file);	/*!< in: file to read message from */
 
-/** Set the deadlock information for a transaction from a file.
-@param trx   transaction that was chosen as deadlock victim
-@param file  file containing the deadlock information */
-void trx_set_deadlock_info_from_file(trx_t *trx, FILE *file);
-
-/** Clear the deadlock information for a transaction.
-@param trx   transaction */
-void trx_clear_deadlock_info(trx_t *trx);
-
 /****************************************************************//**
 Retrieves the error_info field from a trx.
 @return the error info */
@@ -397,11 +388,6 @@ struct trx_lock_t
   /** number of lock_rec_set_nth_bit() calls since the start of transaction;
   protected by lock_sys.is_writer() or trx->mutex_is_owner(). */
   ulint set_nth_bit_calls;
-
-  /** Deadlock information for SHOW WARNINGS; protected by lock_sys.wait_mutex */
-  char *deadlock_info;
-  size_t deadlock_info_len;
-  size_t deadlock_info_size;
 };
 
 /** Logical first modification time of a table in a transaction */
diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc
@@ -7182,6 +7182,8 @@ and less modified rows. Bit 0 is used to prefer orig_trx in case of a tie.
     static const char rollback_msg[]= "*** WE ROLL BACK TRANSACTION (%u)\n";
     char buf[9 + sizeof rollback_msg];
     trx_t *victim= nullptr;
+    char *deadlock_info= nullptr;
+    size_t deadlock_info_len= 0;
 
     /* Here, lock elision does not make sense, because
     for the output we are going to invoke system calls,
@@ -7304,7 +7306,26 @@ and less modified rows. Bit 0 is used to prefer orig_trx in case of a tie.
         }
         snprintf(buf, sizeof buf, rollback_msg, victim_pos);
         print(buf);
-        trx_set_deadlock_info_from_file(victim, lock_latest_err_file);
+
+        if (srv_print_all_deadlocks)
+        {
+          rewind(lock_latest_err_file);
+          fseek(lock_latest_err_file, 0, SEEK_END);
+          long file_size= ftell(lock_latest_err_file);
+          if (file_size > 0)
+          {
+            deadlock_info= static_cast<char*>(ut_malloc_nokey(
+              static_cast<size_t>(file_size) + 1));
+            if (deadlock_info)
+            {
+              rewind(lock_latest_err_file);
+              deadlock_info_len= fread(deadlock_info, 1,
+                                       static_cast<size_t>(file_size),
+                                       lock_latest_err_file);
+              deadlock_info[deadlock_info_len]= '\0';
+            }
+          }
+        }
       }
 
       DBUG_EXECUTE_IF("innodb_deadlock_victim_self", victim= trx;);
@@ -7320,6 +7341,14 @@ and less modified rows. Bit 0 is used to prefer orig_trx in case of a tie.
 func_exit:
     if (current_trx)
       lock_sys.wr_unlock();
+
+    if (deadlock_info && victim == trx && trx->mysql_thd)
+    {
+      push_warning_printf(trx->mysql_thd, Sql_condition::WARN_LEVEL_NOTE,
+                          ER_LOCK_DEADLOCK, "%s", deadlock_info);
+    }
+    ut_free(deadlock_info);
+
     return victim;
   }
 }
diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc
@@ -97,46 +97,6 @@ trx_set_detailed_error_from_file(
 	os_file_read_string(file, trx->detailed_error, MAX_DETAILED_ERROR_LEN);
 }
 
-/** Set the deadlock information for a transaction from a file.
-@param trx   transaction that was chosen as deadlock victim
-@param file  file containing the deadlock information */
-void trx_set_deadlock_info_from_file(trx_t *trx, FILE *file)
-{
-	mysql_mutex_assert_owner(&lock_sys.wait_mutex);
-
-	rewind(file);
-	fseek(file, 0, SEEK_END);
-	long file_size = ftell(file);
-	if (file_size <= 0) {
-		return;
-	}
-
-	size_t needed_size = static_cast<size_t>(file_size) + 1;
-
-	if (needed_size > trx->lock.deadlock_info_size) {
-		ut_free(trx->lock.deadlock_info);
-		trx->lock.deadlock_info = static_cast<char*>(
-			ut_malloc_nokey(needed_size));
-		trx->lock.deadlock_info_size = needed_size;
-	}
-
-	rewind(file);
-	size_t read_len = fread(trx->lock.deadlock_info, 1,
-				static_cast<size_t>(file_size), file);
-	trx->lock.deadlock_info[read_len] = '\0';
-	trx->lock.deadlock_info_len = read_len;
-}
-
-/** Clear the deadlock information for a transaction.
-@param trx   transaction */
-void trx_clear_deadlock_info(trx_t *trx)
-{
-	if (trx->lock.deadlock_info) {
-		trx->lock.deadlock_info[0] = '\0';
-		trx->lock.deadlock_info_len = 0;
-	}
-}
-
 /********************************************************************//**
 Initialize transaction object.
 @param trx trx to initialize */
@@ -232,10 +192,6 @@ struct TrxFactory {
 		trx->detailed_error = reinterpret_cast<char*>(
 			ut_zalloc_nokey(MAX_DETAILED_ERROR_LEN));
 
-		trx->lock.deadlock_info = nullptr;
-		trx->lock.deadlock_info_len = 0;
-		trx->lock.deadlock_info_size = 0;
-
 		trx->lock.lock_heap = mem_heap_create_typed(
 			1024, MEM_HEAP_FOR_LOCK_HEAP);
 		pthread_cond_init(&trx->lock.cond, nullptr);
@@ -282,11 +238,6 @@ struct TrxFactory {
 
 		ut_free(trx->detailed_error);
 
-		ut_free(trx->lock.deadlock_info);
-		trx->lock.deadlock_info = nullptr;
-		trx->lock.deadlock_info_len = 0;
-		trx->lock.deadlock_info_size = 0;
-
 		trx->mutex_destroy();
 
 		trx->autoinc_locks.~small_vector();
@@ -445,7 +396,6 @@ void trx_t::free()
   trx_sys.deregister_trx(this);
   check_unique_secondary= true;
   check_foreigns= true;
-  trx_clear_deadlock_info(this);
   assert_freed();
   trx_sys.rw_trx_hash.put_pins(this);
   mysql_thd= nullptr;
@@ -960,7 +910,6 @@ trx_start_low(
 	ut_ad(trx->rsegs.m_noredo.rseg == NULL);
 	ut_ad(trx_state_eq(trx, TRX_STATE_NOT_STARTED));
 	ut_ad(UT_LIST_GET_LEN(trx->lock.trx_locks) == 0);
-	trx_clear_deadlock_info(trx);
 
 	/* Check whether it is an AUTOCOMMIT SELECT */
         if (const THD* thd = trx->mysql_thd) {
